diff --git a/subsurface.pro b/subsurface.pro
index cca3e3ec5..fe7061f55 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -169,32 +169,40 @@ TRANSLATIONS = \
 	translations/subsurface_da_DK.ts \
 	translations/subsurface_de_CH.ts \
 	translations/subsurface_de_DE.ts \
+	translations/subsurface_el_GR.ts \
 	translations/subsurface_es_ES.ts \
 	translations/subsurface_et_EE.ts \
 	translations/subsurface_fi_FI.ts \
 	translations/subsurface_fr_FR.ts \
+	translations/subsurface_he.ts \
+	translations/subsurface_hu.ts \
 	translations/subsurface_it_IT.ts \
+	translations/subsurface_lv_LV.ts \
 	translations/subsurface_nb_NO.ts \
 	translations/subsurface_nl_NL.ts \
 	translations/subsurface_pl_PL.ts \
 	translations/subsurface_pt_BR.ts \
 	translations/subsurface_pt_PT.ts \
+	translations/subsurface_ro_RO.ts \
 	translations/subsurface_ru_RU.ts \
 	translations/subsurface_sk_SK.ts \
 	translations/subsurface_sv_SE.ts \
-	translations/subsurface_zh_TW.ts \
-	translations/subsurface_he.ts
+	translations/subsurface_tr.ts \
+	translations/subsurface_zh_TW.ts
 
 QTTRANSLATIONS = \
 	qt_da.qm \
 	qt_de.qm \
 	qt_es.qm \
 	qt_fr.qm \
+	qt_he.qm \
+	qt_hu.qm \
 	qt_pl.qm \
 	qt_pt.qm \
 	qt_ru.qm \
 	qt_sk.qm \
-	qt_sv.qm
+	qt_sv.qm \
+	qt_zh_TW.qm
 
 doc.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/Documentation$$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ doc
 all.depends += doc
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index db41b46bc..7cca135af 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="bg_BG" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Вмъкни файл (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Разделител на полета</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Настройка на полета</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Вмъкни CSV файл</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Време</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Температура</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Дълбоч. стоп</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Пре-настроено вмъкване</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Отвори CSV регистър файл</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV файлове (*.csv);;Всички файлове(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Раб.Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Старт.Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Стоп.Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Превключи при</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Бутилката не може да бъде премахната</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>кб.фута</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Модел</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Име на устройство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Прякор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Кликнете тук за да изтриете гмуркачески компютър.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>въздух</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Връщане към OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> начало</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>въздух</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>кб.фута/мин</translation>
     </message>
@@ -209,101 +174,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Покажи Търсене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>Свиване на други</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>Изтрий гмуркане (гмуркания) от пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>Създай ново пътуване отгоре</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>Слей пътуване с горно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>Слей пътуване с долно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>Изтрий гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Маркирай гмуркания (гмуркане) като невалидни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Запиши като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Експорт като UDDF файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>времена на изместване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Качи гмуркане (гмуркания) към Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Запиши гмуркания като...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Запиши файла като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлове (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>Слей избраните гмуркания</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Разделител на полета</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Настройка на полета</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Дълбоч. стоп</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Температура</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Единици</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Метрична</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Империална</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Тагове</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Партньор</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Бележки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Тежест</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Грешка при позицията на държача</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
         <translation>Един или повече от вашите стопове ще бъдат загубени
@@ -370,37 +494,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Финална дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Използван газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Изтрий плана?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Вие ще изтриете плана.</translation>
     </message>
@@ -408,85 +532,158 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Точки в гмуркачески плановик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Достъпни газове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>Добави точка в гмуркането</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>№</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>дата</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>м</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>фута</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>мин</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>кг</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>паунда</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>водолазен костюм</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>бут.</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>местонахождение</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>№</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>дата</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>фута</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>мин</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>паунда</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>водолазен костюм</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>бут.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>макс CNS</translation>
     </message>
@@ -494,115 +691,115 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Грешен отговор от сървъра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Грешен XML отговор. Ред %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>няма избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>не може да бъде създаден ZIP файл: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>не може да бъде създаден файл: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>вътрешна грешка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>вътрешна грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Обновяване на списъка от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Изтегляне на списък от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Изтегляне на %1 гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Изтеглянето приключи - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Неправилно изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Архива не може да бъде отворен:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Грешка при качването</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Успешно качване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Грешка при логин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Не може да бъде направен разбор на отговора</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Грешка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Качването приключи</translation>
     </message>
@@ -610,48 +807,54 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Опитай пак</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Изберете регистър файл при изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Регистър файлове (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Изберете файл за libdivecomputer дъмп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Дъмп файлове (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ Please, remove them first.</source>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Редактирай избраните местонахождения</translation>
     </message>
@@ -728,13 +931,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -760,11 +963,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>Темп. на въздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>Темп. на водата</translation>
     </message>
@@ -790,7 +995,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
@@ -901,92 +1106,102 @@ Please, remove them first.</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Добави бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Тежести</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Добави система за тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Местонахождение на пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Бележки за пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Това пътуване се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Редактира се повече от едно гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Това гмуркане се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>И</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>З</translation>
     </message>
@@ -994,428 +1209,518 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Изглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Вмъкване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Нов регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Отвори регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Запиши като...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Вмъкни файлове</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Експорт на &amp;UDDF...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Напечатай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Изход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Изтегли от леководолазен &amp;компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Вмъкни &amp;GPS данни от Subsurface Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Редактирай имена на устройства</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Преномерирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Превключване на &amp;зуум</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Годишни &amp;статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Списък на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Профил</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Ръководство за &amp;потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Глобус</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>&amp;Планирай гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Вмъкни CSV файл</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Вмъкни CS&amp;V файл</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Вмъкни от Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Добави гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Автоматично групиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Предишен ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Ляво</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Следващ ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Дясно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Избери събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Въведи план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Отвори файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Ръководство за потребителя</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Начъчника на Subsurface не може да бъде намерен</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Запиши промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Моля, първо приключете с текущата редакция на гмуркане.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Запиши файла като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлове (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Годишни статистики</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ Please, remove them first.</source>
         <translation>Използвай бутилка по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Състема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>метър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>литра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>кб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>целзии</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>фаренхайт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>По подразбиране на системата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Обем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Единици за време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Знаменател за скорост на изкачване/спускане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Минути</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Секунди</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Покажи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>праг</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>макс. ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Отчетен таван на гмуркачески компютър</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>рисувай червен таван</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Калкулиран таван</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>покажи всички тъкани</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>увеличение през 3м</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Калкулирай NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow на макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Общи</translation>
     </message>
@@ -1697,37 +1980,32 @@ Please, remove them first.</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Нужен рестарт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Отвори файла по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>&amp;Преглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Пе&amp;чатане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Напечатай</translation>
     </message>
@@ -1873,216 +2151,116 @@ Please, remove them first.</source>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Добави промяна на газа</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Добави бележка</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Премахни събитие</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Премахни малки събития</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Покажи всички събития</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Скрий събития</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Скрий всички %1 събития?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Премахни избраните събития?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>непознат гмуркачески компютър</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Задай времетраене: 10 минути</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Скала</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Линия</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Измери свойства на гмуркачески сегменти</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Мащабиране на гмуркането по големината на екрана</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Редактирай</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>въздух</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Връщане към OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> начало</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> край</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Гмуркане №%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Макс. дълбочина: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Времетраене: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Използван газ:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Тежести:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Бележки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Водач:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Партньор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Водолазен костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Видимост:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Оценка:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Добави промяна на газа</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Добави бележка</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Премахни събитие</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Премахни малки събития</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Покажи всички събития</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>Въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Изтрий тази точка</translation>
     </message>
@@ -2092,22 +2270,22 @@ Please, remove them first.</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
     </message>
@@ -2125,6 +2303,59 @@ Please, remove them first.</source>
         <translation>Нов стартов номер</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Измести избраните времена</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>по-рано</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>по-късно</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Please, remove them first.</source>
         <translation>За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Мутли-платформен гмуркачески регистър софтуер&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Линус Торвалдс, Дирк Хондел, и други, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Лиценз</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Уебсайт</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Затвори</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Please, remove them first.</source>
         <translation>Уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Свръзване...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Изтеглянето приключи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Грешка при изтеглянето: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Грешка при връзка: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Грешен потребителски ключ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Не може да бъде напревен разряд!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Успешно изтегляне!</translation>
     </message>
@@ -2230,17 +2466,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>мл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -2248,20 +2484,33 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Ръководство за потребителя</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Начъчника на Subsurface не може да бъде намерен</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2284,32 +2533,32 @@ Please, remove them first.</source>
         <translation>Въведете вашия ID тук</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Изтегли</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Потребителски ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Качи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Времето за операцията изтече</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Трансфер на данни...</translation>
     </message>
@@ -2317,117 +2566,117 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Кликнете тук за да изтриете система за тежест.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>м</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Година
  &gt; Месец / Пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Продължителност
 Общо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Най-късо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Най-дълго</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Дълбочина (%1)
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Темп. (%1)
@@ -2443,25 +2692,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
@@ -2494,17 +2743,17 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
@@ -2536,20 +2785,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Не може да бъде прочетен &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Не може да се прочете &apos;%s&apos;. Използвайте вмъкване на CSV файлове.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Максималният потдържан брой на CSV колони е %d</translation>
     </message>
@@ -2691,17 +2936,17 @@ Maximum</source>
         <translation>грешен номер на събитие</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Грешка при регистриране на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Грешка при разряд на дата и час</translation>
     </message>
@@ -2716,133 +2961,158 @@ Maximum</source>
         <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <source>Error parsing the maxdepth</source>
         <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Неразпозната стойност за проценти %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Не може да бъде напревен разбор на &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Не може да бъде напревен разбор на &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Базата данни не може да изпълни get_events.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Няма връзка към базата данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Грешка при заява към база данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Не може да бъде отворен стилов файл %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Не може да бъде намерен газ %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Твърде много газови смеси</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,273 +3125,262 @@ Subsurface планиране
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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="551"/>
+        <location filename="../planner.c" line="554"/>
         <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="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Превключи газ на %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Консумация на газ:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s от %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-таван %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Тъкан %.0fмин: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Стоп:%uмин @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Стоп:неопр. време @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Деко:%uмин @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Деко:неопр. време @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-В деко</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fбара</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fбара</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fбара</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%uмин @ %.0f %s (калк.)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>В deco (калк.)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%uмин (калк.)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%uмин (калк,)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d мин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 гмуркане)</translation>
     </message>
@@ -3221,142 +3480,142 @@ TTS:%uмин (калк,)</translation>
         <translation>деко</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>повече от %d дни</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>за гмуркания №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>за избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>за гмуркане №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>за избраните гмуркане</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>за вички гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(няма гмуркания)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Ср</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Съб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Ян</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Март</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Юни</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Юли</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Сеп</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -3386,187 +3645,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Uemis Zurich включен ли е правилно?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Четене на гмуркане %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>данни</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>идент. за вписване в регистъра</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>идент. за вписване на местонахождение</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>повече данни за гмуркане</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>мокър костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>полусух</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>сух костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>къс</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>жилетка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>лонг джон</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>яке</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>пълен косюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2 за цял костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>мембрана</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Започни връзка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis не може да бъде зареден</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Започни теглене</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Нарушение на безопасно спиране</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Тревога: скорост</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Внимание: скорост</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Внимание: парциално О2 налягане в зелената зона</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Внимание: покачване на парциално О2 налягане</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Тревога: покачване на парциално О2 налягане</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Информация: налагане на резервоар</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Внимание: оставащо газ-време</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Тревога: оставащо газ-време</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Предложение за смяна на резервоар</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Надминат лимит на дълбочина</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Внимание: Максимално време на сигнал за декомпресия</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Времева Информация за гмуркане</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Тревога: Време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Маркер</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Няма информация за резервоар</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Внимание: слаба батерия</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Тревога: слаба батерия</translation>
     </message>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index c5e7c13d1..df973da3b 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importer fil (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Felt separator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Felt konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importer CSV fil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Dybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Stop dybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>For-konfigurerede imports</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Åben CSV log fil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV Filer (*.csv);;Alle Filer(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>ArbejdsTryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>StartTryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>SlutTryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Skift på</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasken kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Enheds ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Kaldenavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Klik her, vil fjerne denne dykkercomputer</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>BailOut til OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>start</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -209,101 +174,260 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Vis søgebox</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>Vis alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>Skjul alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>Saml andre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>Fjern dyk fra tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>Opret ny tur over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>Flet tur med ovenstående</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>Flet tur med efterstående</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>Slet dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Marker dyk som ugyldig(e)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Gem som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Exporter som UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>Skift tider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Upload dyk til divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Gem dyk som...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Gem fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>Flet valgte dyk</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Felt separator</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <source>Pre-configured imports</source>
+        <translation>For-konfigurerede imports</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="290"/>
+        <source>Field Configuration</source>
+        <translation>Felt konfiguration</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Dybde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Stop dybde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Enheder</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrisk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Position</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Makker</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Noter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Vægt</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Handler Position Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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,
@@ -370,37 +494,37 @@ slet dem venligst først.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Slut Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Brugt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation> Kassér Planen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Du er ved kassére din plan.</translation>
     </message>
@@ -408,85 +532,158 @@ slet dem venligst først.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Dive Planner Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Gasser tilrådighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>Tilføj dykker data point</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>Dato</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>fod</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min.</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>Dragt</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>Flaske</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>Sted</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>fod</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>Dragt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>Flaske</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>Sted</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>MaxCNS</translation>
     </message>
@@ -494,115 +691,115 @@ slet dem venligst først.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Ugyldigt svar fra serveren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>ingen dyk var valgt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>Kunne ikke danne en zip fil til upload: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>Kan ikke danne midlertidig fil: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>Intern fejl: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>Intern fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Færdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Uploader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Downloader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Downloader %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Download færdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Fejl i download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Upload fejlede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Uploadet med succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Login fejlede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke fortolke svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Fejl: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Upload færdig</translation>
     </message>
@@ -610,48 +807,54 @@ slet dem venligst først.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Prøv igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Logfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump filer (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ slet dem venligst først.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Rediger valgte dykker steder</translation>
     </message>
@@ -728,13 +931,13 @@ 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="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Position</translation>
     </message>
@@ -760,11 +963,13 @@ slet dem venligst først.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Vand temp</translation>
     </message>
@@ -790,7 +995,7 @@ slet dem venligst først.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
@@ -901,92 +1106,102 @@ slet dem venligst først.</translation>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flasker </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Tilføj flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Tilføj vægt system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Tur position</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Tur noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Turen er ved at blive rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flere dyk bliver rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Dette dyk bliver rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -994,428 +1209,518 @@ slet dem venligst først.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny logbog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Crtl-N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Åben logbog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Åben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Crtl-O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Crtl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Gem som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importer filer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Export &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Print</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afslut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer fra &amp;dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Edit Enheds navne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Re-Nummerer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Vælg &amp;Zoom</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Årlig Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Liste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Bruger &amp;Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Plan Dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importer CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importer CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importer fra Divelog.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Tilføj Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Auto Gruppering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Forrige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Næste DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Højre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Vælg hændelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Input Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Åben fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Brugermanual</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Kan ikke finde Subsurface manualen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Gem ændringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Færdiggør først dette dyk før du laver/retter et nyt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Gem fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ slet dem venligst først.</translation>
         <translation>Brug standard flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personliggør</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>System Standard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Tids enheder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Vis op- og nedstignings hastighed i</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>Tærskel</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Dykkercomputer rapporteret loft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>Tegn loft rødt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Beregnet loft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>Vis alle væv</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m step</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Beregn NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow på max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
@@ -1697,37 +1980,32 @@ slet dem venligst først.</translation>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHøj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Genstart nødvendigt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Åben standard log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ slet dem venligst først.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>&amp;Vis Udskrift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>U&amp;dskriv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Udskriv:</translation>
     </message>
@@ -1873,216 +2151,116 @@ slet dem venligst først.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Tilføj gas skift</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Tilføj bogmærke</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Fjern hændelse</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Skjul tilsvarende hændelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Vis alle hændelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Skjul hændelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Skjul alle %1 hændelser?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Fjern den valgte hændelse?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>Ukendt dykkercomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Sæt varighed: 10 minutter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Skaler</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Målestok</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Præferencer for segmentet</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Skaler dykket til skærmstørrelsen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Rediger</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>BailOut til OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>start</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>slut</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Varighed: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Gas brugt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Vægt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Noter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Makker:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Dragt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Sigt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Tilføj gas skift</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Tilføj bogmærke</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Fjern hændelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Skjul tilsvarende hændelser</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Vis alle hændelser</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Fjern dette punkt</translation>
     </message>
@@ -2092,22 +2270,22 @@ slet dem venligst først.</translation>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Dobbelt klik for at sætte positionen</translation>
     </message>
@@ -2125,6 +2303,59 @@ slet dem venligst først.</translation>
         <translation>Nyt start nummer</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Skift valgte tider</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>Tidligere</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>Senere</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ slet dem venligst først.</translation>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&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, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>%Licens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>%Hjemmeside</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Luk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ slet dem venligst først.</translation>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Forbinder...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Download færdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Download fejl; %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Forbindelses fejl:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruger id</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke fortolke svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Download succes!</translation>
     </message>
@@ -2230,17 +2466,17 @@ slet dem venligst først.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ slet dem venligst først.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Brugermanual</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Kan ikke finde Subsurface manualen</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ slet dem venligst først.</translation>
         <translation>Tast dit ID her:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Bruger ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Upload</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Tiden er udløbet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -2317,117 +2566,117 @@ slet dem venligst først.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt;Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Varighed
 Ialt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Længst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dybde (%1)
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2443,25 +2692,25 @@ Gennemsnit</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2494,17 +2743,17 @@ Gennemsnit</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -2536,20 +2785,16 @@ Gennemsnit</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fejl i læsning af &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Kunne ikke læse &apos;%s&apos;. Brug import for CSV filer.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maksimum antal kolonner i CSV import er %d</translation>
     </message>
@@ -2691,17 +2936,17 @@ Gennemsnit</translation>
         <translation>Ugyldigt hændelses nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Fejl i registrering af data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Fejl ved fortolkning af dato/tid</translation>
     </message>
@@ -2716,133 +2961,158 @@ Gennemsnit</translation>
         <translation>Fejl i fortolkning af dykkertid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fejl ved at opnå overflade tryk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Fejl i fortolkning af prøver</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Fejl: registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fejl: registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Import fejl i dykker data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan ikke danne libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kan ikke åbne %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation> Mærkelig procent læsning %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Kunne ikke fortolke &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Database forespørgsel get_events fejlede
  </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Database forbindelse fejlede &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database forespørgsel fejlede &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan ikke åbne stylesheet %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Kan ikke finde gas %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>For mange gas blandinger</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,35 +3125,35 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Skift gas til %s⏎
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Gasforbrug:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s of %s⏎
@@ -2891,240 +3161,228 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s⏎
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s⏎
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s⏎
-Beregnet loft %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Væv %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s⏎
-Sikkerhedsstop:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
- D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s⏎
-Sikkerhedsstop:Ukendt tid @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s⏎
-Deko:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s⏎
-Deko:unkn time @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-I deko</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s⏎
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s⏎
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s⏎
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s⏎
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s⏎
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s⏎
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s⏎
-EAD:%d%s⏎
-END:%d%s⏎
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deko:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-I Deko (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (beregn)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s
 </translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
  %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
@@ -3224,142 +3482,142 @@ TTS:%umin (beregn)</translation>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>mere end %d dage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>for dyk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>for de valgte dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>for dyk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>for valgt dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>for alle dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(ingen dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3389,187 +3647,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Er Uemis Zurich tilsluttet korrekt?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Læser %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>Dykkerlog indgang id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>Dykkersted data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>Flere dykker data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>våddragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>tørdragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>Long John</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>Jakke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>heldragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2-delt heldragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Init Communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis start op fejlede</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Begynd download</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Sikkerhedsstop overtrædelse</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Hastighedsalam</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Hastighedsalarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>PO2 Grøn advarsel</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>PO2 opstignings alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>PO2 opstignings alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Flaske tryk info</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>RGT Advarsel</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>RGT Alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Flaske skift anbefalet</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Dybde grænse overskredet</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Max deko tid advarsel</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Dykker Tid info</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Dykker Tid Alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Marker</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Ingen flaske data</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Lav batteri alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Lav batteri alarm</translation>
     </message>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index 665177f9d..9381eae75 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -1,151 +1,73 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="de_CH" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Datei importieren (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Feld Trenner</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Feldkonfiguration</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>CSV Datei importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Stopptiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Vorkonfigurierte Importe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>CSV Log Datei öffnen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV Dateien (*.csv);;Alle Dateien(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>max. Fülldruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Druck vorh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Druck nachh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Wechsel bei</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -172,35 +94,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>Luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Notausstieg mit offenem System</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> Anfang</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>Luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -208,101 +173,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>Entferne Tauchgang aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>Reise mit Reise darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>Reise mit Reise darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Tauchgang(gänge) als ungültig kennzeichnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Tauchgang(gänge) auf divelogs.de hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Speichere Tauchgänge als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Feld Trenner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Feldkonfiguration</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Stopptiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Einheiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrisch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Zöllig</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Stichworte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -344,22 +468,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Problematische Position des Knotens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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.
@@ -369,37 +493,37 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Plan verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -407,85 +531,158 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>Nr.</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>Datum</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>Anzug</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>Flasche</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>Tauchplatz</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>US Pfund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>Flasche</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>Tauchplatz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -493,115 +690,115 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Ungültige Serverantwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>konnte keine zip Datei für die Übertragung erstellen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>kann keine temporäre Datei erstellen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>Interner Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>Interner Fehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Übertrage Liste der Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Übertragung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Übertragung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Login fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Übertragung beendet</translation>
     </message>
@@ -609,48 +806,54 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Log Dateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -718,7 +921,7 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Ausgewählte Tauchplätze bearbeiten</translation>
     </message>
@@ -727,13 +930,13 @@ Bitte entferne diese zuerst.</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -759,11 +962,13 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>Wassertemperatur</translation>
     </message>
@@ -789,7 +994,7 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -900,92 +1105,102 @@ Bitte entferne diese zuerst.</translation>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Blei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Ziel der Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -993,428 +1208,518 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Dateien importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportiere &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>Gerätenamen &amp;bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>&amp;Zoom ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Tauchgangliste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Bedienungsanleitung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Tauchgang p&amp;lanen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>CSV importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>CS&amp;V importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>von Divelogs.de importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Automatisch gruppieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Ereignisse auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Über Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Benutzerhandbuch</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Kann das Subsurface Handbuch nicht finden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein anderer Tauchgang bearbeitet werden kann.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1484,209 +1789,187 @@ Bitte entferne diese zuerst.</translation>
         <translation>Wähle Deine Standardflasche(n)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalisiert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>Fuss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Systemeinstellung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>Schwelle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Auftauchgrenze Tauchcomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>tiefster Deko-Stopp rot markieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Berechnete Auftauchgrenze</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>alle Gewebe anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m Stufen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Null-/Auftauchzeit berechnen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
@@ -1696,37 +1979,32 @@ Bitte entferne diese zuerst.</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Standard Logfile öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1734,22 +2012,22 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -1872,216 +2150,116 @@ Bitte entferne diese zuerst.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Gaswechsel setzen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Markierung setzen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Entferne Ereigniss</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Ähnliche Ereignisse ausblenden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Alle Ereignisse einblenden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Ereignisse ausblenden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Alle %1 Ereignisse ausblenden?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Ausgewähltes Ereignis entfernen?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>Unbekannter Tauchcomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Setze Dauer: 10 Minuten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Massstab</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Lineal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Eigenschaften der Tauchgangssegmente messen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Tauchgang auf Bildschirmgrösse skalieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Bearbeiten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>Luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Notausstieg mit offenem System</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> Anfang</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> Ende</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Gaswechsel setzen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Markierung setzen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Entferne Ereigniss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Ähnliche Ereignisse ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Alle Ereignisse einblenden</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Diesen Punkt entfernen</translation>
     </message>
@@ -2091,22 +2269,22 @@ Bitte entferne diese zuerst.</translation>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
@@ -2124,6 +2302,59 @@ Bitte entferne diese zuerst.</translation>
         <translation>Neue erste Nummer</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Ausgewählte Zeiten verschieben</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>früher</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>später</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2160,20 +2391,25 @@ Bitte entferne diese zuerst.</translation>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-Plattform Programm zur Verwaltung von Taucher-Logbucheinträgen&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, und andere, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Lizenz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Webseite</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Schliessen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2183,37 +2419,37 @@ Bitte entferne diese zuerst.</translation>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
@@ -2229,17 +2465,17 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2247,20 +2483,33 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Benutzerhandbuch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Kann das Subsurface Handbuch nicht finden</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2283,32 +2532,32 @@ Bitte entferne diese zuerst.</translation>
         <translation>ID eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Benutzer-Kennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Übertrage Daten...</translation>
     </message>
@@ -2316,37 +2565,37 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2354,79 +2603,79 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2442,25 +2691,25 @@ Mittel</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2493,17 +2742,17 @@ Mittel</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
@@ -2535,20 +2784,16 @@ Mittel</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>&apos;%s&apos; lesen fehlgeschlagen. Benutze Importieren für CSV Dateien.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
@@ -2690,17 +2935,17 @@ Mittel</translation>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
@@ -2715,133 +2960,158 @@ Mittel</translation>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Fehler beim Lesen von &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Kann Gasgemisch %d/%d nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2854,274 +3124,262 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Gaswechsel zu %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Gasverbrauch:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-D:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Berechneter tiefster Deko-Stopp %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Gewebe %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Sicherheitsstopp:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-Tiefe:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deko:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deko:unbk Zeit @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-In Deko</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deko:%umin @ %.0f %s (berechnet)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-Deko (berechnet)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-Nullzeit:%umin (berechnet)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-Auftauchzeit:%umin (berechnet)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
@@ -3221,142 +3479,142 @@ Auftauchzeit:%umin (berechnet)</translation>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3386,187 +3644,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Lese %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>Logbucheintrag mit ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>Tauchplatz Daten ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>mehr Daten für Tauchgang ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>Weste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Verbindung aufbauen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Beginne zu Laden</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Verletzung des Sicherheitsstopps</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm: Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Warnung: Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Warnung: PO₂ Grün</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Warnung: Aufstieg / PO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarm: Aufstieg / PO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Info: Flaschendruck</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Warnung: verbleibende Gas-Zeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alarm: verbleibende Gas-Zeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Gaswechsel-Vorschlag</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Tiefenlimit überschritten</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Warnung: Maximale Deko Zeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Info: Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alarm: Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Keine Flaschen Informationen</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Warnung: Batterie schwach</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarm: Batterie schwach</translation>
     </message>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 4314d565e..4036ee3e2 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -1,151 +1,73 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Datei importieren (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Feld Trenner</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Feldkonfiguration</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>CSV Datei importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Stopptiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Vorkonfigurierte Importe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>CSV Log Datei öffnen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV Dateien (*.csv);;Alle Dateien(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>max. Fülldruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Druck vorh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Druck nachh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Wechsel bei</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
         <translation>cu.ft.</translation>
     </message>
@@ -172,35 +94,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>Luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Notausstieg mit offenem System</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> Anfang</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>Luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -208,101 +173,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>Entferne Tauchgang aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>Reise mit Reise darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>Reise mit Reise darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Tauchgang(gänge) als ungültig kennzeichnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation>lade Bilder</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Tauchgang(gänge) auf divelogs.de hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Speichere Tauchgänge als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation>Öffne Bilddateien</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <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="730"/>
         <source>merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Feld Trenner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Feldkonfiguration</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Stopptiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Einheiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrisch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Zöllig</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation>Manuelle Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation>Tauchgang Nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Stichworte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation>Min. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -344,22 +468,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Problematische Position des Knotens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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.
@@ -369,37 +493,37 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Plan verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -407,85 +531,158 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>Nr.</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>Datum</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation>Benutzer Eingabe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation>Flaschen Index</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>Anzug</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation>Druck S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>Flasche</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation>Druck I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>Tauchplatz</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation>tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation>PN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>PHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>US Pfund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>Flasche</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>Tauchplatz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>AMV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -493,115 +690,115 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Ungültige Serverantwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>konnte keine zip Datei für die Übertragung erstellen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>kann keine temporäre Datei erstellen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>ein interner Fehler ist aufgetreten: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Übertrage Liste der Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Übertragung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Übertragung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Login fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Übertragung beendet</translation>
     </message>
@@ -609,48 +806,54 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Finde Uemis Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Log Dateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -718,7 +921,7 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Ausgewählte Tauchplätze bearbeiten</translation>
     </message>
@@ -727,13 +930,13 @@ Bitte entferne diese zuerst.</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -759,11 +962,13 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>Wassertemperatur</translation>
     </message>
@@ -789,7 +994,7 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -900,92 +1105,102 @@ Bitte entferne diese zuerst.</translation>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Blei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Ziel der Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -993,428 +1208,518 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Strg+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Strg+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Dateien importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Strg+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportiere &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation>EAD, END, EADD anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Strg+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Strg+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Strg+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>Gerätenamen &amp;bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Strg++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Strg+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>&amp;Zoom ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Strg+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Tauchgangliste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Bedienungsanleitung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Tauchgang p&amp;lanen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Strg+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>CSV importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>CS&amp;V importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>von Divelogs.de importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Strg+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation>MOD einschalten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <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"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation>Berechnete tiefste Deko-Stopps anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <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"/>
+        <source>Calculate All Tissues</source>
+        <translation>Berechne alle Gewebe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation>Zeige SAC Rate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation>Lineal Ein-/Ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Strg+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Automatisch gruppieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Strg+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Strg+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Strg+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Strg+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Ereignisse auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Über Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Strg+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation>Importiere Log-Dateien</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importiere Tauchlogdateien aus anderen Anwendungen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation>&amp;Vollbild</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation>Vollbild Umschalten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Benutzerhandbuch</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Kann das Subsurface Handbuch nicht finden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein anderer Tauchgang bearbeitet werden kann.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation>Öffne Tauchlog Datei</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <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>PreferencesDialog</name>
@@ -1484,209 +1789,187 @@ Bitte entferne diese zuerst.</translation>
         <translation>Wähle Deine Standardflasche(n)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>Fuß</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation>Schwellenwert bei pO₂ Anzeige</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation>Schwellenwert bei pN₂ Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation>Schwellenwert bei pHe Anzeige</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation>max ppO₂ bei MOD Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <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="655"/>
+        <source>unused tanks</source>
+        <translation>unbenutzte Flaschen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>Schwelle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Auftauchgrenze Tauchcomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>tiefster Deko-Stopp rot markieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Berechnete Auftauchgrenze</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>alle Gewebe anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m Stufen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Null-/Auftauchzeit berechnen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
@@ -1696,37 +1979,32 @@ Bitte entferne diese zuerst.</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>AMV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Standard Logfile öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1734,22 +2012,22 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -1872,216 +2150,116 @@ Bitte entferne diese zuerst.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Gaswechsel setzen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Markierung setzen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Entferne Ereigniss</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Ähnliche Ereignisse ausblenden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Alle Ereignisse einblenden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Ereignisse ausblenden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Alle %1 Ereignisse ausblenden?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Ausgewähltes Ereignis entfernen?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>Unbekannter Tauchcomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Setze Dauer: 10 Minuten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Maßstab</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Lineal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Eigenschaften der Tauchgangssegmente messen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Tauchgang auf Bildschirmgrößem skalieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Bearbeiten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>Luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Notausstieg mit offenem System</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> Anfang</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> Ende</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>AMV:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Tauchgruppenleiter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Gaswechsel setzen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Markierung setzen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Entferne Ereigniss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Ähnliche Ereignisse ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Alle Ereignisse einblenden</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Diesen Punkt entfernen</translation>
     </message>
@@ -2091,22 +2269,22 @@ Bitte entferne diese zuerst.</translation>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
@@ -2124,6 +2302,59 @@ Bitte entferne diese zuerst.</translation>
         <translation>Neue erste Nummer</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Ausgewählte Zeiten verschieben</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation>Ausgewählte Zeiten von Bild(ern) verschieben um...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>früher</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>später</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation>Versatz der Kamerazeit festlegen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <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="193"/>
+        <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="181"/>
+        <source>Open Image File</source>
+        <translation>Öffne Bilddateien</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2160,20 +2391,25 @@ Bitte entferne diese zuerst.</translation>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-Plattform Programm zur Verwaltung von Taucher-Logbucheinträgen&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, und andere, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Lizenz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Webseite</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-Plattform Tauchlog Software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, und andere, 2011-2014&lt;/span&gt;</translation>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2183,37 +2419,37 @@ Bitte entferne diese zuerst.</translation>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
@@ -2229,17 +2465,17 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2247,20 +2483,33 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Benutzerhandbuch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Kann das Subsurface Handbuch nicht finden</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2283,32 +2532,32 @@ Bitte entferne diese zuerst.</translation>
         <translation>Hier ID eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Benutzer-Kennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Übertrage Daten...</translation>
     </message>
@@ -2316,37 +2565,37 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2354,79 +2603,79 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
 Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>AMV (%1)
 Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2442,25 +2691,25 @@ Mittel</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cu.ft.</translation>
     </message>
@@ -2493,17 +2742,17 @@ Mittel</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
@@ -2535,20 +2784,16 @@ Mittel</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>&apos;%s&apos; lesen fehlgeschlagen. Benutze Importieren für CSV Dateien.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
@@ -2690,17 +2935,17 @@ Mittel</translation>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
@@ -2715,133 +2960,162 @@ Mittel</translation>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Fehler beim Lesen von &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation>Datenbank Anfrage &apos;get_tags&apos; fehlgeschlagen.
+</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation>Datenbank Anfrage &apos;get_cylinders&apos; fehlgeschlagen.
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation>Datenbank Anfrage &apos;get_changes&apos; fehlgeschlagen.
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <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="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Kann Gasgemisch %d/%d nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2854,274 +3128,290 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Gaswechsel zu %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Gasverbrauch:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-D:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Berechneter tiefster Deko-Stopp %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Gewebe %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Sicherheitsstopp:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-Tiefe:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-AMV:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deko:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deko:unbk Zeit @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-In Deko</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation>@: %d:%02d
+D: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation>P: %d%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation>T: %.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation>V: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation>SAC: %2.1fl/min
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation>CNS: %u%%
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deko:%umin @ %.0f %s (berechnet)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation>pO%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-Deko (berechnet)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation>pN%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-Nullzeit:%umin (berechnet)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation>pHe: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-Auftauchzeit:%umin (berechnet)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation>MOD: %d%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation>Sicherheitsstop: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation>Deko: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation>Deko: unbek. Zeit @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation>In Deko
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation>NDL: %umin
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation>Deko: %umin @ %.0f%s (berechnet)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation>Deko (berechnet)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation>NDL: %umin (berechnet)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation>TTS: %umin (berechnet)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation>Berechneter tiefster Deko-Stopp %.0f %s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation>Gewebe %.0fmin: %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation>Herzschlag: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation>Peilung: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
@@ -3221,142 +3511,142 @@ Auftauchzeit:%umin (berechnet)</translation>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dt %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3386,187 +3676,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Lese %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>Logbucheintrag mit ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>Tauchplatz Daten ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>mehr Daten für Tauchgang ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>Weste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Verbindung aufbauen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Beginne zu Laden</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Verletzung des Sicherheitsstopps</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm: Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Warnung: Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Warnung: PO₂ Grün</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Warnung: Aufstieg / PO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarm: Aufstieg / PO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Info: Flaschendruck</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Warnung: verbleibende Gas-Zeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alarm: verbleibende Gas-Zeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Gaswechsel-Vorschlag</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Tiefenbegrenzung überschritten</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Warnung: Maximale Deko Zeit</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Info: Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alarm: Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Keine Flaschen Informationen</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Warnung: Batterie schwach</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarm: Batterie schwach</translation>
     </message>
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
new file mode 100644
index 000000000..49b463417
--- /dev/null
+++ b/translations/subsurface_el_GR.ts
@@ -0,0 +1,3833 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="el_GR" version="2.0">
+<context>
+    <name>CylindersModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Type</source>
+        <translation>Τύπος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Size</source>
+        <translation>Μέγεθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>WorkPress</source>
+        <translation>Πίεση Λειτουργίας</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>StartPress</source>
+        <translation>Αρχική Πίεση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>EndPress</source>
+        <translation>Τελική Πίεση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>O</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <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="341"/>
+        <source>Cylinder cannot be removed</source>
+        <translation>Η φιάλη δεν μπορεί να διαγραφεί</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="342"/>
+        <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="488"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="489"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="512"/>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="513"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
+    </message>
+</context>
+<context>
+    <name>DiveComputerManagementDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
+        <source>Edit Dive Computer Nicknames</source>
+        <translation>Επεξεργασία Ονομάτων Υπολογιστών Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="45"/>
+        <source>Remove the selected Dive Computer?</source>
+        <translation>Να αφαιρεθεί ο επιλεγμένος Υπολογιστής Κατάδυσης;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
+        <source>Are you sure that you want to 
+ remove the selected dive computer?</source>
+        <translation>Ο Υπολογιστής Κατάδυσης θα αφαιρεθεί.
+Είστε σίγουροι;</translation>
+    </message>
+</context>
+<context>
+    <name>DiveComputerModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Model</source>
+        <translation>Μοντέλο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Device ID</source>
+        <translation>ID Συσκευής</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Nickname</source>
+        <translation>Όνομα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation>Πατώντας εδώ θα διαγραφεί αυτός ο υπολογιστής κατάδυσης.</translation>
+    </message>
+</context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>αέρας</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Bailing out σε ανοικτό κύκλωμα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>έναρξη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>αέρας</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
+<context>
+    <name>DiveItem</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
+        <source> l/min</source>
+        <translation>l/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source> cuft/min</source>
+        <translation>cuft/min</translation>
+    </message>
+</context>
+<context>
+    <name>DiveListView</name>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
+        <source>Show Search Box</source>
+        <translation>Εμφάνιση Πεδίου Αναζήτησης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <source>expand all</source>
+        <translation>επέκταση όλων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <source>collapse all</source>
+        <translation>σύμπτυξη όλων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <source>collapse others</source>
+        <translation>Σύμπτυξη των άλλων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <source>remove dive(s) from trip</source>
+        <translation>αφαίρεση κατάδυσης(-σεων) από το ταξίδι</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <source>create new trip above</source>
+        <translation>δημιουργία νέου ταξιδιού από πάνω</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
+        <source>add dive(s) to trip immediately above</source>
+        <translation>προσθήκη κατάδυσης(σεων) στο ταξίδι αμέσως από πάνω</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <source>merge trip with trip above</source>
+        <translation>συγχώνευση με το ταξίδι από πάνω</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
+        <source>merge trip with trip below</source>
+        <translation>συγχώνευση με το ταξίδι από κάτω</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
+        <source>delete dive(s)</source>
+        <translation>διαγραφή κατάδυσης(-σεων)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <source>mark dive(s) invalid</source>
+        <translation>σημειώστε την κατάδυση(σεις) ως άκυρη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <source>save As</source>
+        <translation>αποθήκευση ως...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <source>export As UDDF</source>
+        <translation>εξαγωγή ως UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
+        <source>shift times</source>
+        <translation>αλλαγή χρόνων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
+        <source>upload dive(s) to divelogs.de</source>
+        <translation>μεταφόρτωση κατάδυσης(σεων) στο divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
+        <source>Save Dives As...</source>
+        <translation>Αποθήκευση Καταδύσεων ως...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
+        <source>Save File as</source>
+        <translation>Αποθήκευση Αρχείου ως...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF αρχεία (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
+        <source>merge selected dives</source>
+        <translation>συγχώνευση επιλεγμένων καταδύσεων</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Διαχωριστής Πεδίου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Ρυθμίσεις Πεδίου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Stopdepth</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Ώρα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Θερμοκρασία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Μονάδες Μέτρησης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Μετρικό</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Ετικέτες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Ζευγάρι</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Βάρος</translation>
+    </message>
+</context>
+<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>Τελευταία Στάση στα 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"/>
+        <source>ATM Pressure</source>
+        <translation>Πίεση ATM</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
+        <source>10m</source>
+        <translation>10m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
+        <source>30ft</source>
+        <translation>30ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
+        <source>Handler Position Error</source>
+        <translation>Handler Position Error</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
+        <source>One or more of your stops will be lost with this operations, 
+Please, remove them first.</source>
+        <translation>Μία ή περισσότερες στάσεις θα χαθούν,
+Παρακαλώ, πρώτα αφαιρέστε τις.</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerPointsModel</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
+        <source>AIR</source>
+        <translation>AIR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
+        <source>Final Depth</source>
+        <translation>Τελικό Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
+        <source>Used Gas</source>
+        <translation>Χρησιμοποιημένο Αέριο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
+        <source>CC Set Point</source>
+        <translation>CC Set Point</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
+        <source>Discard the Plan?</source>
+        <translation>Απόρριψη του Πλάνου;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
+        <source>You are about to discard your plan.</source>
+        <translation>Είστε έτοιμοι να απορρίψετε το Πλάνο.</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
+        <source>Dive Planner Points</source>
+        <translation>Πόντοι Dive Planner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
+        <source>Available Gases</source>
+        <translation>Διαθέσιμα Αέρια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation>add dive data point</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Ώρα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Πίεση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Θερμοκρασία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>στολή</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>φιάλη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>τοποθεσία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>maxCNS</source>
+        <translation>maxCNS</translation>
+    </message>
+</context>
+<context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
+        <source>Invalid response from server</source>
+        <translation>Άκυρη απάντηση από τον σέρβερ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
+        <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="552"/>
+        <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="559"/>
+        <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="110"/>
+        <source>no dives were selected</source>
+        <translation>καμία κατάδυση δεν έχει επιλεγεί</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
+        <source>failed to create zip file for upload: %1</source>
+        <translation>αποτυχία στη δημιουργία του zip αρχείου για μεταφόρτωση: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
+        <source>cannot create temporary file: %1</source>
+        <translation>δεν μπορεί να δημιουργηθεί το προσωρινό αρχείο: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
+        <source>internal error: %1</source>
+        <translation>εσωτερικό σφάλμα: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
+        <source>internal error</source>
+        <translation>εσωτερικό σφάλμα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
+        <source>Done</source>
+        <translation>Done</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
+        <source>Uploading dive list...</source>
+        <translation>Μεταφόρτωση λίστας καταδύσεων...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
+        <source>Downloading dive list...</source>
+        <translation>Λήψη λίστας καταδύσεων...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
+        <source>Downloading %1 dives...</source>
+        <translation>Λήψη %1 καταδύσων...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <source>Download finished - %1</source>
+        <translation>Η λήψη τελείωσε - %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <source>Corrupted download</source>
+        <translation>Κατεστραμμένη λήψη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί:
+%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <source>Upload failed</source>
+        <translation>Η μεταφόρτωση απέτυχε</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
+        <source>Upload successful</source>
+        <translation>Η μεταφόρτωση πέτυχε</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
+        <source>Login failed</source>
+        <translation>Login failed</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
+        <source>Cannot parse response</source>
+        <translation>Cannot parse response</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
+        <source>Error: %1</source>
+        <translation>Σφάλμα: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <source>Upload finished</source>
+        <translation>Η μεταφόρτωση τελείωσε</translation>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDCWidget</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>OK</source>
+        <translation>ΟΚ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
+        <source>Error</source>
+        <translation>Σφάλμα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <source>Retry</source>
+        <translation>Επανάληψη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
+        <source>Choose file for divecomputer download logfile</source>
+        <translation>Επιλέξτε το αρχείο για το logfile της λήψης από τον υπολογιστή κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
+        <source>Log files (*.log)</source>
+        <translation>Log files (*.log)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
+        <source>Warning</source>
+        <translation>Προειδοποίηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
+        <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="346"/>
+        <source>Choose file for divecomputer binary dump file</source>
+        <translation>Επιλέξτε αρχείο για το binary dump file του υπολογιστή κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <source>Dump files (*.bin)</source>
+        <translation>Dump files (*.bin)</translation>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDiveComputer</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <source>Download From Dive Computer</source>
+        <translation>Λήψη από Υπολογιστή Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <source>Vendor</source>
+        <translation>Κατασκευαστής</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <source>Dive Computer</source>
+        <translation>Υπολογιστής Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <source>Device or Mount Point</source>
+        <translation>Συσκευή ή Σημείο Προσάρτησης</translation>
+    </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>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <source>Force download of all dives</source>
+        <translation>Λήψη όλων των καταδύσεων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <source>Always prefer downloaded dives</source>
+        <translation>Προτίμηση των ληφθέντων καταδύσεων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <source>OK</source>
+        <translation>ΟΚ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <source>Cancel</source>
+        <translation>Ακύρωση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Save libdivecomputer logfile</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Save libdivecomputer dumpfile</translation>
+    </message>
+</context>
+<context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Επεξεργασία Επιλεγμένων Τοποθεσιών Κατάδυσης</translation>
+    </message>
+</context>
+<context>
+    <name>MainTab</name>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <source>Dive Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="120"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <source>Coordinates</source>
+        <translation>Συντεταγμένες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <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="235"/>
+        <source>Air temp</source>
+        <translation>Εξωτερική Θερμοκρασία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
+        <source>Water temp</source>
+        <translation>Θερμοκρασία Νερού</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <source>Tags</source>
+        <translation>Ετικέτες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <source>Rating</source>
+        <translation>Βαθμός</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <source>Visibility</source>
+        <translation>Ορατότητα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <source>Suit</source>
+        <translation>Στολή</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <source>Equipment</source>
+        <translation>Εξοπλισμός</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <source>Dive Info</source>
+        <translation>Πληροφορίες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="395"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <source>Interval</source>
+        <translation>Διάλειμμα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <source>Gases Used</source>
+        <translation>Αέρια που χρησιμοποιήθηκαν</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <source>Gas Consumed</source>
+        <translation>Αέριο που καταναλώθηκε</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="471"/>
+        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <source>Max. Depth</source>
+        <translation>Μέγιστο Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <source>Ave. Depth</source>
+        <translation>Μέσο Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <source>Air Pressure</source>
+        <translation>Ατμοσφαιρική Πίεση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <source>Air Temperature</source>
+        <translation>Εξωτερική Θερμοκρασία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <source>Water Temperature</source>
+        <translation>Θερμοκρασία Νερού</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <source>Dive Time</source>
+        <translation>Διάρκεια Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <source>Salinity</source>
+        <translation>Αλμυρότητα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <source>Stats</source>
+        <translation>Στατιστικά</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <source>Depth</source>
+        <translation>Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <source>Temperature</source>
+        <translation>Θερμοκρασία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <source>Total Time</source>
+        <translation>Συνολική Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <source>Dives</source>
+        <translation>Καταδύσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <source>Cylinders</source>
+        <translation>Φιάλες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <source>Add Cylinder</source>
+        <translation>Προσθήκη Φιάλης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <source>Weights</source>
+        <translation>Βάρη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
+        <source>Add Weight System</source>
+        <translation>Προσθήκη Βαρών</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
+        <source>Trip Location</source>
+        <translation>Τοποθεσία Ταξιδιού</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <source>Trip Notes</source>
+        <translation>Σημειώσεις Ταξιδιού</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <source>Save</source>
+        <translation>Αποθήκευση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <source>Cancel</source>
+        <translation>Ακύρωση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
+        <source>This trip is being edited.</source>
+        <translation>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
+        <source>Multiple dives are being edited.</source>
+        <translation>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
+        <source>This dive is being edited.</source>
+        <translation>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
+        <source>unknown</source>
+        <translation>άγνωστο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <source>Filter</source>
+        <translation>Φίλτρο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
+        <source>&amp;File</source>
+        <translation>&amp;File</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
+        <source>&amp;Log</source>
+        <translation>&amp;Log</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
+        <source>&amp;View</source>
+        <translation>&amp;View</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Help</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
+        <source>&amp;Import</source>
+        <translation>&amp;Import</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
+        <source>&amp;New logbook</source>
+        <translation>&amp;New logbook</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
+        <source>New</source>
+        <translation>Νέο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
+        <source>&amp;Open logbook</source>
+        <translation>&amp;Open logbook</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
+        <source>Open</source>
+        <translation>Άνοιγμα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Save</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
+        <source>Save</source>
+        <translation>Αποθήκευση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
+        <source>Save as</source>
+        <translation>Αποθήκευση ως...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
+        <source>Close</source>
+        <translation>Κλείσιμο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
+        <source>Export &amp;UDDF</source>
+        <translation>Εξαγωγή σε &amp;UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation>Εκτύ&amp;πωση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation>Έ&amp;ξοδος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Εισαγωγή από &amp;υπολογιστή κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
+        <translation>Εισαγωγή δεδομένων &amp;GPS από την υπηrεσία Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
+        <source>&amp;Edit Device Names</source>
+        <translation>&amp;Επεξεργασία Ονομάτων Συσκευών</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <source>&amp;Renumber</source>
+        <translation>Επ&amp;αναρίθμηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation>&amp;Ετήσια Στατιστικά</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>Dive List</source>
+        <translation>Λίστα Καταδύσεων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <source>Profile</source>
+        <translation>Προφίλ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <source>Info</source>
+        <translation>Πληροφορίες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
+        <source>All</source>
+        <translation>Όλα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
+        <source>User &amp;Manual</source>
+        <translation>Εγχερίδιο &amp;Χρήσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
+        <source>Globe</source>
+        <translation>Globe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
+        <source>P&amp;lan Dive</source>
+        <translation>Σχε&amp;διασμός Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
+        <source>Import from Divelogs.de</source>
+        <translation>Εισαγωγή από Divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <source>Preferences</source>
+        <translation>Προτιμήσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
+        <source>Add Dive</source>
+        <translation>Προσθήκη Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <source>Auto Group</source>
+        <translation>Αυτόματη Oμαδοποίηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <source>Prev DC</source>
+        <translation>Προηγ. DC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
+        <source>Left</source>
+        <translation>Αριστερά</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <source>Next DC</source>
+        <translation>Επόμενο DC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
+        <source>Right</source>
+        <translation>Δεξιά</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <source>Select Events</source>
+        <translation>Επιλογή Συμβάντων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
+        <source>Input Plan</source>
+        <translation>Εισαγωγή Πλάνου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
+        <source>About Subsurface</source>
+        <translation>Περί...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
+        <source>Open File</source>
+        <translation>Άνοιγμα Αρχείου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <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="276"/>
+        <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="342"/>
+        <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="564"/>
+        <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="566"/>
+        <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="571"/>
+        <source>Save Changes?</source>
+        <translation>Αποθήκευση Αλλαγών;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
+        <source>Save File as</source>
+        <translation>Αποθήκευση Αρχείου ως...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
+        <source>Warning</source>
+        <translation>Προειδοποίηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <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="248"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF αρχεία (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
+        <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <source>Defaults</source>
+        <translation>Προεπιλογές</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <source>Units</source>
+        <translation>Μονάδες Μέτρησης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <source>Graph</source>
+        <translation>Γράφημα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation>Γλώσσα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <source>Lists and Tables</source>
+        <translation>Λίστες και Πίνακες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <source>Font</source>
+        <translation>Γραμματοσειρά</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <source>Font size</source>
+        <translation>Μέγεθος Γραμματοσειράς</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <source>Dives</source>
+        <translation>Καταδύσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="176"/>
+        <source>Default Dive file</source>
+        <translation>Προεπιλεγμένο Αρχείο Καταδύσεων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <source>Display Invalid</source>
+        <translation>Εμφάνιση Άκυρου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <source>Default Cylinder</source>
+        <translation>Προεπιλεγμένη Φιάλη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="220"/>
+        <source>Use Default Cylinder</source>
+        <translation>Χρήση Προεπιλεγμένης Φιάλης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
+        <source>System</source>
+        <translation>Σύστημα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <source>Metric</source>
+        <translation>Μετρικό</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <source>Personalize</source>
+        <translation>Προσαρμογή</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <source>Depth</source>
+        <translation>Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
+        <source>meter</source>
+        <translation>μέτρα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <source>feet</source>
+        <translation>πόδια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <source>liter</source>
+        <translation>λίτρα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <source>cu ft</source>
+        <translation>cu ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <source>celsius</source>
+        <translation>celsius</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <source>fahrenheit</source>
+        <translation>fahrenheit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
+        <source>System Default</source>
+        <translation>Προεπιλογή Συστήματος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Filter</source>
+        <translation>Φίλτρο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <source>Pressure</source>
+        <translation>Πίεση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <source>Volume</source>
+        <translation>Όγκος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <source>Temperature</source>
+        <translation>Θερμοκρασία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <source>Weight</source>
+        <translation>Βάρος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
+        <source>Time units</source>
+        <translation>Μονάδες Μέτρησης Χρόνου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
+        <source>Ascent/Descent speed denominator</source>
+        <translation>Παρανομαστής Ταχύτητας Ανόδου/Καθόδου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
+        <source>Minutes</source>
+        <translation>Λεπτά (min)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
+        <source>Seconds</source>
+        <translation>Δευτερόλεπτα (sec)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
+        <source>Show</source>
+        <translation>Εμφάνιση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow στο μέγιστο βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
+        <source>Misc</source>
+        <translation>Διάφορα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Προτιμήσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
+        <source>Restart required</source>
+        <translation>Απαιτείται επανεκκίνηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
+        <source>To correctly load a new language you must restart Subsurface.</source>
+        <translation>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Open Default Log File</source>
+        <translation>Άνοιγμα προεπιλεγμένου Aρχείου Kαταγραφής (logfile)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
+    </message>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Προεπισκόπηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
+        <source>P&amp;rint</source>
+        <translation>Εκτύ&amp;πωση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
+        <source>&amp;Close</source>
+        <translation>Έ&amp;ξοδος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
+        <source>Print</source>
+        <translation>Εκτύπωση</translation>
+    </message>
+</context>
+<context>
+    <name>PrintLayout</name>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <source>Dive#</source>
+        <translation>Κατάδυση#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <source>Depth</source>
+        <translation>Βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <source>Master</source>
+        <translation>Master</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <source>Buddy</source>
+        <translation>Ζευγάρι</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
+</context>
+<context>
+    <name>PrintOptions</name>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
+        <source>Print options</source>
+        <translation>Επιλογές Εκτύπωσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
+        <source>Print only selected dives</source>
+        <translation>Εκτύπωση μόνο Επιλεγμένων Καταδύσεων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
+        <source>Print in color</source>
+        <translation>Εκτύπωση με χρώμα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
+        <source>Print type</source>
+        <translation>Τύπος Εκτύπωσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
+        <source>6 dives per page</source>
+        <translation>6 καταδύσεις ανά σελίδα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
+        <source>2 dives per page</source>
+        <translation>2 καταδύσεις ανά σελίδα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
+        <source>Table print</source>
+        <translation>Εκτύπωση Πίνακα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
+        <source>Ordering</source>
+        <translation>Ταξινόμηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
+        <source>Profile on top</source>
+        <translation>Προφίλ στο πάνω μέρος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
+        <source>Notes on top</source>
+        <translation>Σημειώσεις στο πάνω μέρος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
+        <source>Sizing heights (% of layout)</source>
+        <translation>Ύψη αναφοράς (% of layout)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
+        <source>Profile height (43% - 85%)</source>
+        <translation>Ύψος Προφίλ (43% - 85%)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
+        <source>Other data height (8% - 17%)</source>
+        <translation>Ύψος άλλων δεδομένων (8% - 17%)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
+        <source>Notes height (0% - 52%)</source>
+        <translation>Ύψος σημειώσεων (0% - 52%)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+</context>
+<context>
+    <name>ProfilePrintModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
+        <source>unknown</source>
+        <translation>άγνωστο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
+        <source>Dive #%1 - %2</source>
+        <translation>Κατάδυση #%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
+        <source>Max depth: %1 %2</source>
+        <translation>Μέγιστο Βάθος: %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
+        <source>Duration: %1 min</source>
+        <translation>Διάρκεια: %1 min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <source>Gas Used:</source>
+        <translation>Αέριο που χρησιμοποιήθηκε:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
+        <source>SAC:</source>
+        <translation>SAC:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
+        <source>Max. CNS:</source>
+        <translation>Max. CNS:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
+        <source>Weights:</source>
+        <translation>Βάρη:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
+        <source>Notes:</source>
+        <translation>Σημειώσεις:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
+        <source>Divemaster:</source>
+        <translation>Divemaster:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <source>Buddy:</source>
+        <translation>Ζευγάρι:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <source>Suit:</source>
+        <translation>Στολή:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <source>Viz:</source>
+        <translation>Ορατότητα:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <source>Rating:</source>
+        <translation>Βαθμός:</translation>
+    </message>
+</context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Προσθήκη Αλλαγής Αερίου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Προσθήκη σελιδοδείκτη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Αφαίρεση συμβάντος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Απόκρυψη παρόμοιων συμβάντων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Απόκρυψη όλων των συμβάντων</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
+        <source>AIR</source>
+        <translation>ΑΕΡΑΣ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
+        <source>Remove this Point</source>
+        <translation>Αφαίρεση αυτού του σημείου</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <source>Close</source>
+        <translation>Κλείσιμο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Μέσος όρος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Ελάχιστο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Μέγιστο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation>
+    </message>
+</context>
+<context>
+    <name>RenumberDialog</name>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="14"/>
+        <source>Renumber</source>
+        <translation>Επαναρίθμηση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="31"/>
+        <source>New starting number</source>
+        <translation>Νέος αρχικός αριθμός</translation>
+    </message>
+</context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Μετακίνηση επιλεγμένων χρόνων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>νωρίτερα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>αργότερα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShiftTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Μετακίνηση επιλεγμένων χρόνων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="37"/>
+        <source>Shift times of selected dives by</source>
+        <translation>Μετακίνηση επιλεγμένων καταδύσεων για</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="73"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="83"/>
+        <source>earlier</source>
+        <translation>νωρίτερα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>later</source>
+        <translation>αργότερα</translation>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceAbout</name>
+    <message>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation>Περί...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="80"/>
+        <source>&amp;License</source>
+        <translation>&amp;Άδεια Χρήσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="87"/>
+        <source>&amp;Website</source>
+        <translation>&amp;Ιστοσελίδα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Έ&amp;ξοδος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <source>Webservice</source>
+        <translation>Webservice</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
+        <source>Connecting...</source>
+        <translation>Σύνδεση...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
+        <source>Download finished</source>
+        <translation>Η λήψη τελείωσε</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <source>Download error: %1</source>
+        <translation>Σφάλμα λήψης: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
+        <source>Connection Error: </source>
+        <translation>Σφάλμα Επικοινωνίας:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <source>Invalid user identifier!</source>
+        <translation>Άκυρος έλεγχος χρήστη!</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Cannot parse response!</source>
+        <translation>Cannot parse response!</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
+        <source>Download Success!</source>
+        <translation>Επιτυχής Λήψη!</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <location filename="../qt-ui/tableview.cpp" line="23"/>
+        <source>Add Cylinder</source>
+        <translation>Προσθήκη Φιάλης</translation>
+    </message>
+</context>
+<context>
+    <name>TankInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>Description</source>
+        <translation>Περιγραφή</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+</context>
+<context>
+    <name>ToolTipItem</name>
+    <message>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
+        <source>Information</source>
+        <translation>Πληροφορίες</translation>
+    </message>
+</context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Εγχειρίδιο Χρήσης</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Δεν βρέθηκε το εγχειρίδιο χρήσης</translation>
+    </message>
+</context>
+<context>
+    <name>WSInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>Description</source>
+        <translation>Περιγραφή</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+</context>
+<context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Webservice Connection</source>
+        <translation>Webservice Connection</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="25"/>
+        <source>Status:</source>
+        <translation>Κατάσταση:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="32"/>
+        <source>Enter your ID here</source>
+        <translation>Εισαγωγή του ID εδώ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
+        <source>Download</source>
+        <translation>Λήψη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
+        <source>User ID</source>
+        <translation>ID χρήστη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
+        <source>Upload</source>
+        <translation>Μεταφόρτωση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
+        <source>Operation timed out</source>
+        <translation>Operation timed out</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
+        <source>Transfering data...</source>
+        <translation>Μεταφορά δεδομένων...</translation>
+    </message>
+</context>
+<context>
+    <name>WeightModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Type</source>
+        <translation>Τύπος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Weight</source>
+        <translation>Βάρος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="416"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation>Πατήστε εδώ για διαγραφή αυτού του συστήματος βαρών</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="441"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="442"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="465"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="466"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+</context>
+<context>
+    <name>YearlyStatisticsModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <source>Year 
+ &gt; Month / Trip</source>
+        <translation>Έτος
+&gt; Μήνας / Ταξίδι</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
+        <source>Duration 
+ Total</source>
+        <translation>Συνολική
+Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
+        <source>
+Average</source>
+        <translation>
+Μέσος Όρος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
+        <source>
+Shortest</source>
+        <translation>
+Συντομότερο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
+        <source>
+Longest</source>
+        <translation>
+Μακρύτερο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
+        <source>Depth (%1)
+ Average</source>
+        <translation>Μέσο
+Βάθος (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
+        <source>
+Minimum</source>
+        <translation>
+Ελάχιστο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
+        <source>
+Maximum</source>
+        <translation>
+Μέγιστο</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
+        <source>SAC (%1)
+ Average</source>
+        <translation>Μέσο
+SAC (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
+        <source>Temp. (%1)
+ Average</source>
+        <translation>Μέση
+Θερμοκρασία (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>gettextFromC</name>
+    <message>
+        <location filename="../dive.c" line="57"/>
+        <source>pascal</source>
+        <translation>pascal</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="62"/>
+        <location filename="../qt-gui.cpp" line="348"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="66"/>
+        <location filename="../qt-gui.cpp" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="103"/>
+        <location filename="../qt-gui.cpp" line="327"/>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="108"/>
+        <location filename="../qt-gui.cpp" line="332"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="137"/>
+        <location filename="../qt-gui.cpp" line="232"/>
+        <location filename="../qt-gui.cpp" line="247"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="142"/>
+        <location filename="../qt-gui.cpp" line="235"/>
+        <location filename="../qt-gui.cpp" line="249"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="258"/>
+        <location filename="../qt-gui.cpp" line="268"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="191"/>
+        <location filename="../qt-gui.cpp" line="256"/>
+        <location filename="../qt-gui.cpp" line="266"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="1104"/>
+        <source>(%s) or (%s)</source>
+        <translation>(%s) ή (%s)</translation>
+    </message>
+    <message>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
+        <source>air</source>
+        <translation>αέρας</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="170"/>
+        <source>integrated</source>
+        <translation>ενσωματωμένα</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="171"/>
+        <source>belt</source>
+        <translation>ζώνη</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="172"/>
+        <source>ankle</source>
+        <translation>αστραγάλου</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="173"/>
+        <source>backplate weight</source>
+        <translation>βάρος backplate</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="174"/>
+        <source>clip-on</source>
+        <translation>clip-on</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
+        <source>Failed to read &apos;%s&apos;</source>
+        <translation>Αποτυχία ανάγνωσης &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
+        <source>Maximum number of supported columns on CSV import is %d</source>
+        <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>none</source>
+        <translation>κανένα</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>deco stop</source>
+        <translation>στάση αποσυμπίεσης</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ascent</source>
+        <translation>άνοδος</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ceiling</source>
+        <translation>ταβάνι</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>workload</source>
+        <translation>φόρτο εργασίας</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>transmitter</source>
+        <translation>πομπός</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>violation</source>
+        <translation>παράβαση</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>bookmark</source>
+        <translation>σελιδοδείκτης</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>surface</source>
+        <translation>επιφάνεια</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>safety stop</source>
+        <translation>στάση ασφαλείας</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>gaschange</source>
+        <translation>αλλαγή αερίου</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (voluntary)</source>
+        <translation>στάση ασφαλείας (προληπτική)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (mandatory)</source>
+        <translation>στάση ασφαλείας (υποχρεωτική)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>deepstop</source>
+        <translation>βαθιά στάση</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>ceiling (safety stop)</source>
+        <translation>ταβάνι (στάση ασφαλείας)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>divetime</source>
+        <translation>διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <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="143"/>
+        <source>maxdepth</source>
+        <translation>μέγιστο βάθος</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>airtime</source>
+        <translation>airtime</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>rgbm</source>
+        <translation>rgbm</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>heading</source>
+        <translation>heading</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>tissue level warning</source>
+        <translation>προειδοποίηση επιπέδου ιστών</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>non stop time</source>
+        <translation>non stop time</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="161"/>
+        <source>invalid event number</source>
+        <translation>άκυρος αριθμός συμβάντος</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="403"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Αδύνατον να αναλυθεί το %s %s</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="409"/>
+        <source>Error registering the data</source>
+        <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="417"/>
+        <source>Error parsing the datetime</source>
+        <translation>Σφάλμα στην ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="433"/>
+        <source>Dive %d: %s %d %04d</source>
+        <translation>Κατάδυση %d: %s %d %04d</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="438"/>
+        <source>Error parsing the divetime</source>
+        <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="447"/>
+        <source>Error parsing the maxdepth</source>
+        <translation>Σφάλμα στο μέγιστο βάθος</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="456"/>
+        <source>Error parsing the gas mix count</source>
+        <translation>Σφάλμα στον αριθμό των αερίων</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="468"/>
+        <source>Error obtaining water salinity</source>
+        <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="476"/>
+        <source>Error obtaining surface pressure</source>
+        <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="484"/>
+        <source>Error parsing the gas mix</source>
+        <translation>Σφάλμα στο μίγμα αερίων</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="491"/>
+        <source>Error parsing the samples</source>
+        <translation>Σφάλμα στα δείγματα</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="621"/>
+        <source>Event: waiting for user action</source>
+        <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="629"/>
+        <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="689"/>
+        <source>Error registering the event handler.</source>
+        <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="694"/>
+        <source>Error registering the cancellation handler.</source>
+        <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="715"/>
+        <source>Dive data import error</source>
+        <translation>Σφάλμα στην εισαγωγή δεδομένων</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="754"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation>Unable to create libdivecomputer context</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="761"/>
+        <source>Unable to open %s %s (%s)</source>
+        <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="484"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Περίεργο νούμερο ποσοστού %s
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1625"/>
+        <source>Failed to parse '%s'.
+</source>
+        <translation>Σφάλμα στην ανάλυση του &apos;%s&apos;
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1626"/>
+        <source>Failed to parse &apos;%s&apos;</source>
+        <translation>Σφάλμα στην ανάλυση του &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1845"/>
+        <source>Database query get_events failed.
+</source>
+        <translation>Σφάλμα στο ερώτημα get_events της βάσης δεδομένων
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
+        <source>Database connection failed '%s'.
+</source>
+        <translation>Σφάλμα στην επικοινωνία με την βάση δεδομένων &apos;%s&apos;
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
+        <source>Database query failed '%s'.
+</source>
+        <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων &apos;%s&apos;
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <source>Can&apos;t open stylesheet %s</source>
+        <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="132"/>
+        <source>Can&apos;t find gas %d/%d</source>
+        <translation>Το αέριο %d/%d δεν υπάρχει</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="324"/>
+        <source>Too many gas mixes</source>
+        <translation>Πάρα πολλά μείγματα αερίων</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="504"/>
+        <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>
+    </message>
+    <message>
+        <location filename="../planner.c" line="545"/>
+        <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="554"/>
+        <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="565"/>
+        <source>Switch gas to %s
+</source>
+        <translation>Switch gas to %s
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="573"/>
+        <source>Gas consumption:
+</source>
+        <translation>Κατανάλωση αερίου:
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="584"/>
+        <source>%.0f%s of %s
+</source>
+        <translation>%.0f%s of %s
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="783"/>
+        <source>ean</source>
+        <translation>ean</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1234"/>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1238"/>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1247"/>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
+        <source>%sT: %d:%02d min</source>
+        <translation>%sT: %d:%02d min</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
+        <source>%s %sD:%.1f%s</source>
+        <translation>%s %sD:%.1f%s</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1430"/>
+        <source>%s %sD:%.1f%s
+</source>
+        <translation>%s %sD:%.1f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1434"/>
+        <source>%s%sV:%.2f%s</source>
+        <translation>%s%sV:%.2f%s</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
+        <source>%s %sV:%.2f%s</source>
+        <translation>%s %sV:%.2f%s</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1449"/>
+        <source>%s %sP:%d %s</source>
+        <translation>%s %sP:%d %s</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="308"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="311"/>
+        <source>F</source>
+        <translation>F</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="498"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="511"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation>%1 %2, %3
+%4:%5</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="524"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation>%1 %2 (%3 dives)</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="529"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation>%1 %2 (1 dive)</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>boat</source>
+        <translation>σκάφος</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>shore</source>
+        <translation>ακτή</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>drift</source>
+        <translation>ρεύμα</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>deep</source>
+        <translation>βαθιά</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>cavern</source>
+        <translation>ανοικτό σπήλαιο</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>ice</source>
+        <translation>πάγος</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>wreck</source>
+        <translation>ναυάγιο</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>cave</source>
+        <translation>σπήλαιο</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>altitude</source>
+        <translation>υψόμετρο</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>pool</source>
+        <translation>πισίνα</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>lake</source>
+        <translation>λίμνη</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>river</source>
+        <translation>ποτάμι</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>night</source>
+        <translation>νύχτα</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation>fresh</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation>μαθητής</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
+        <translation>φωτογραφία</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
+        <translation>βίντεο</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation>εκπαιδευτής</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
+        <source>deco</source>
+        <translation>αποσυμπίεση</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="216"/>
+        <source>more than %d days</source>
+        <translation>περισσότερο από %d ημέρες</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="222"/>
+        <source>%dd %dh %dmin</source>
+        <translation>%dd %dh %dmin</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dh %dmin</source>
+        <translation>%dh %dmin</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="235"/>
+        <source>for dives #</source>
+        <translation>για καταδύσεις #</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="242"/>
+        <source>for selected dives</source>
+        <translation>για επιλεγμένες καταδύσεις</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="277"/>
+        <source>for dive #%d</source>
+        <translation>για κατάδυση #%d</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="279"/>
+        <source>for selected dive</source>
+        <translation>για επιλεγμένη κατάδυση</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="281"/>
+        <source>for all dives</source>
+        <translation>για όλες τις καταδύσεις</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="283"/>
+        <source>(no dives)</source>
+        <translation>(καμία κατάδυση)</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sun</source>
+        <translation>Κυρ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Mon</source>
+        <translation>Δευ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Tue</source>
+        <translation>Τρι</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Wed</source>
+        <translation>Τετ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Thu</source>
+        <translation>Πεμ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Fri</source>
+        <translation>Παρ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sat</source>
+        <translation>Σαβ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jan</source>
+        <translation>Ιαν</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Feb</source>
+        <translation>Φεβ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Mar</source>
+        <translation>Μαρ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Apr</source>
+        <translation>Απρ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>May</source>
+        <translation>Μαι</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jun</source>
+        <translation>Ιουν</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Jul</source>
+        <translation>Ιουλ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Aug</source>
+        <translation>Αυγ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Sep</source>
+        <translation>Σεπ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Oct</source>
+        <translation>Οκτ</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Nov</source>
+        <translation>Νοε</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Dec</source>
+        <translation>Δεκ</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="24"/>
+        <source>Uemis Zurich: File System is almost full
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+        <translation>Uemis Zurich: Το σύστημα αρχείων είναι γεμάτο
+Αποσυνδέστε/επανασυνδέστε τον υπολογιστή κατάδυσης
+και πατήστε &apos;Επανάληψη&apos;</translation>
+    </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>Uemis Zurich: Το σύστημα αρχείων είναι γεμάτο
+Αποσυνδέστε/επανασυνδέστε τον υπολογιστή κατάδυσης
+και προσπαθήστε ξανά</translation>
+    </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>Μικρή εγγραφή στο αρχείο req.txt
+Είναι το Uemis Zurich σωστά συνδεδεμένο;</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="107"/>
+        <source>unknown</source>
+        <translation>άγνωστο</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="379"/>
+        <source>Reading %s %s</source>
+        <translation>Reading %s %s</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="399"/>
+        <source>data</source>
+        <translation>δεδομένα</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>divelog entry id</source>
+        <translation>divelog entry id</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="422"/>
+        <source>divespot data id</source>
+        <translation>divespot data id</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="424"/>
+        <source>more data dive id</source>
+        <translation>more data dive id</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>wetsuit</source>
+        <translation>υγρού τύπου</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>semidry</source>
+        <translation>ημιστεγανή</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>drysuit</source>
+        <translation>στεγανή</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>shorty</source>
+        <translation>μονοσόρτς</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>vest</source>
+        <translation>γιλέκο</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>long john</source>
+        <translation>long john</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>jacket</source>
+        <translation>jacket</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>full suit</source>
+        <translation>μονοκόματη</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>2 pcs full suit</source>
+        <translation>2 κομματιών</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="620"/>
+        <source>membrane</source>
+        <translation>μεμβράνης</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="802"/>
+        <source>Init Communication</source>
+        <translation>Init Communication</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="804"/>
+        <source>Uemis init failed</source>
+        <translation>Uemis init failed</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="815"/>
+        <source>Start download</source>
+        <translation>Έναρξη λήψης</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="196"/>
+        <source>Safety Stop Violation</source>
+        <translation>Παραβίαση στάσης ασφαλείας</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="198"/>
+        <source>Speed Alarm</source>
+        <translation>Συναγερμός Ταχύτητας</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="201"/>
+        <source>Speed Warning</source>
+        <translation>Προειδοποίηση Ταχύτητας</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="203"/>
+        <source>PO2 Green Warning</source>
+        <translation>Προειδοποίηση πράσινου PO2</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="206"/>
+        <source>PO2 Ascend Warning</source>
+        <translation>Προειδοποίηση PO2 ανόδου</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="208"/>
+        <source>PO2 Ascend Alarm</source>
+        <translation>Συναγερμός PO2 ανόδου</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="212"/>
+        <source>Tank Pressure Info</source>
+        <translation>Πληροφορίες Πίεσης Φιάλης</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="214"/>
+        <source>RGT Warning</source>
+        <translation>RGT Warning</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="216"/>
+        <source>RGT Alert</source>
+        <translation>RGT Alert</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="218"/>
+        <source>Tank Change Suggested</source>
+        <translation>Πρόταση Αλλαγής Φιάλης</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="220"/>
+        <source>Depth Limit Exceeded</source>
+        <translation>Υπέρβαση Ορίου Βάθους</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="222"/>
+        <source>Max Deco Time Warning</source>
+        <translation>Προειδοποίηση Μέγιστης Διάρκειας Αποσυμπίεσης</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="224"/>
+        <source>Dive Time Info</source>
+        <translation>Πληροφορίες Διάρκεια Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="226"/>
+        <source>Dive Time Alert</source>
+        <translation>Προειδοποίηση Διάρκειας Κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="228"/>
+        <source>Marker</source>
+        <translation>Marker</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="230"/>
+        <source>No Tank Data</source>
+        <translation>Δεν υπάρχουν δεδομένα Φιάλης</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="232"/>
+        <source>Low Battery Warning</source>
+        <translation>Προειδοποίηση Χαμηλής Μπαταρίας</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="234"/>
+        <source>Low Battery Alert</source>
+        <translation>Συναγερμός Χαμηλής Μπαταρίας</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 b4b64b331..09b1f38a1 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importar archivo (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>…</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Separador de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Configuración de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importar archivo CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Hora de entrada</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Profundidad</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Profundidad de parada</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Importaciones pre-configuradas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Abrir archivo CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>Archivos CSV (*.csv);;Todos los Archivos(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Pres. trabajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Pres. inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Pres. final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Cambiar a </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>La botella no puede borrarse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>pie³</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>ID del dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Pulsar aquí borrará este ordenador de buceo.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>aire</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Cambio de emergencia a OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>comienzo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>aire</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>Pie³/min</translation>
     </message>
@@ -209,101 +174,260 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Mostrar ventana de busqueda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>Expandir todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>Encoger todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>Encoger otros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>Borrar inmersión(es) del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>Crear nuevo viaje arriba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <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="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>Borrar inmersión(es)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Marcar inmersión(es) como inválida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>Desplazar horas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation>Carga imágenes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Subir inmersión(es) a divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Guardar las inmersiones como…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Guardar archivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation>Abrir archivo de imagen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Archivos de imagen (</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>Mezclar las inmersiones seleccionadas</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Separador de campos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Configuración de campos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Profundidad</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Profundidad de parada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Hora de entrada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Unidades</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <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"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation>Inmersiones manuales</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation>Inmersión #</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Ubicación</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation>Gps</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation>Profundidad máxima</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation>Profundidad media</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Compañero</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Error en la posición del punto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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.
@@ -370,37 +494,37 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>AIRE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Profundidad final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gas usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>¿Quiere descartar el plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Está a punto de descartar su plan.</translation>
     </message>
@@ -408,85 +532,158 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Puntos del planificador de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Gases disponibles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>Añadir punto de datos de inmersión.</translation>
     </message>
 </context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Profundidad</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Hora de entrada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Presión</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation>Usuario introducido</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation>Lista de botellas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation>Presión S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation>Presión I</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation>Techo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation>PN2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>PHE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
         <source>date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
         <source>suit</source>
         <translation>traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
         <source>cyl</source>
         <translation>bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
         <source>location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -494,115 +691,115 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Respuesta del servidor no válida.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>No se seleccionó ninguna inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>Fallo al crear archivo zip para subir: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>No se puede crear archivo temporal: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>Error interno: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>Error interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Hecho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Subiendo lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Descargando lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Descargando %1 inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Descarga finalizada - </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>La subida ha fallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Subida correcta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>El acceso ha fallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>No se puede leer la respuesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Subida finalizada</translation>
     </message>
@@ -610,48 +807,54 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Intentar de nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Encontrar ordenador de buceo Uemis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Archivos Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Archivos de volcado (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Editar los puntos de buceo seleccionados.</translation>
     </message>
@@ -728,13 +931,13 @@ 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="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
@@ -760,11 +963,13 @@ Por favor, bórralas antes.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Temperatura del agua</translation>
     </message>
@@ -790,7 +995,7 @@ Por favor, bórralas antes.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -901,92 +1106,102 @@ Por favor, bórralas antes.</translation>
         <translation>Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Añadir botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Añadir sistema de lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Ubicación del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Notas del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Este viaje está siendo editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Se están editando varias inmersiones.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Esta inmersión esta siendo editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -994,428 +1209,518 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nuevo registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Abrir registr&amp;o</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importar Archivos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportar &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation>Activar PEA, PNE y EADD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>Im&amp;primir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <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="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Editar nombres de dispositivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Activar &amp;Zoom</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Lista de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manual de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globo </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanificar Inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importar CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importar CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importar desde Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>…</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation>Activar la PMO</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <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"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation>Mostrar techo calculado por Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <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"/>
+        <source>Calculate All Tissues</source>
+        <translation>Calcular todos los tejidos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation>Mostrar tasa de CAS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation>Activar / Desactivar la regla</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Añadir inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Auto agrupar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Anterior ordenador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Siguiente ordenador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Seleccionar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Introducir Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation>Importar archivos de registro</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <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="878"/>
+        <source>&amp;Full Screen</source>
+        <translation>Pantalla completa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation>Activar pantalla completa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Manual de usuario</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>No puedo encontrar el manual de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>¿Guardar los cambios?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Termina primero la edición actual antes de intentar editar otra.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Guardar archivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Estadísticas anuales</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation>Abrir archivo de registro de inmersiones</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <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>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ Por favor, bórralas antes.</translation>
         <translation>Usar botella por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>pie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>pie³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation>Umbral al mostrar la pO2</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation>Umbral al mostrar la pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation>Umbral al mostrar la pHe</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation>ppO2 máxima al mostrar la PMO</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <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="655"/>
+        <source>unused tanks</source>
+        <translation>Botellas sin usar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Predeterminado del sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Presión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Unidades de tiempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Denominador de la velocidad de ascenso/descenso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>umbral</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>PMO</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>PEA PNE EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Techo informado por el ordenador</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>Dibujar el techo en rojo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Techo calculado</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>Mostrar todos los tejidos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>Incrementos de 3m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Calcular NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GF bajo a la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
@@ -1697,37 +1980,32 @@ Por favor, bórralas antes.</translation>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Reinicio requerido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Abrir archivo de registro por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>&amp;Previsualizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Imp&amp;rimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -1873,216 +2151,116 @@ Por favor, bórralas antes.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Añadir cambio de gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Añadir marcador</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Borrar evento</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Ocultar eventos similares</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Revelar todos los eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Ocultar eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>¿ Ocultar todos los eventos %1 ?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>¿Quiere eliminar el evento seleccionado?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>Ordenador desconocido</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Fijar duración: 10 minutos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Escala</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Regla</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Medir propiedades de segmentos de la inmersión</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>escalar la inmersión al tamaño de pantalla</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Editar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>aire</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Cambio de emergencia a OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>comienzo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>fin</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Inmersión n.º %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Profundidad máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Duración: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Gas usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Lastre:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Traje:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Visibilidad:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Calificación:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Añadir cambio de gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Añadir marcador</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Borrar evento</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Ocultar eventos similares</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Revelar todos los eventos</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>AIRE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Borrar este punto</translation>
     </message>
@@ -2092,22 +2270,22 @@ Por favor, bórralas antes.</translation>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Promedio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <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>
@@ -2125,6 +2303,59 @@ Por favor, bórralas antes.</translation>
         <translation>Número de partida nuevo</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Desplazar las horas seleccionadas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation>Desplazar la hora de la(s) imagen(es) en</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>más pronto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>más tarde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <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="155"/>
+        <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="193"/>
+        <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="181"/>
+        <source>Open Image File</source>
+        <translation>Abrir archivo de imagen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Archivos de imagen (</translation>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Por favor, bórralas antes.</translation>
         <translation>Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Software de registro de inmersiones multiplataforma&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel y otros, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Licencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>Sitio &amp;web</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Cerrar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Software de registro de inmersiones multiplataforma&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;</translation>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Por favor, bórralas antes.</translation>
         <translation>Servicio web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Conectando…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Descarga finalizada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Error de descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Error de conexión:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>El identificador de usuario no es válido.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>No se puede analizar la respuesta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Se ha completado la descarga correctamente.</translation>
     </message>
@@ -2230,17 +2466,17 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Manual de usuario</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>No puedo encontrar el manual de Subsurface</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ Por favor, bórralas antes.</translation>
         <translation>Introduce aquí tu ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>ID del usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Subir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Tiempo de espera sobrepasado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Transfiriendo datos…</translation>
     </message>
@@ -2317,117 +2566,117 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Año
 &gt; Mes / Viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Duración
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Más larga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidad (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>CAS (%1)
 Medio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2443,25 +2692,25 @@ Media</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>pie³</translation>
     </message>
@@ -2494,17 +2743,17 @@ Media</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>aire</translation>
     </message>
@@ -2536,20 +2785,16 @@ Media</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>No se pudo leer «%s»</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Falló al leer «%s». Use la importación para los archivos CSV.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>El máximo número de columnas que soporta importar CSV es %d</translation>
     </message>
@@ -2691,17 +2936,17 @@ Media</translation>
         <translation>el número de evento no es válido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Error al registrar los datos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Error al analizar la fecha</translation>
     </message>
@@ -2716,133 +2961,162 @@ Media</translation>
         <translation>Error al analizar el tiempo de buceo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Error al obtener salinidad del agua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error al obtener la presión en superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Error al analizar la mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Error al analizar las muestras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: esperando acción del usuario</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Error al registrar el manejador de eventos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Error al importar datos de inmersiones</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Porcentaje extraño al leer %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>No se pudo analizar «%s».
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>No se pudo analizar «%s»</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <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="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation>Consulta de la base de datos get_tags falló.
+</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Falló la conexión a la base de datos «%s».
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <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="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <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="2004"/>
+        <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="2011"/>
+        <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="2102"/>
         <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="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>No encuentro el gas %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas mezclas de gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,274 +3129,289 @@ basado en GFbajo = %.0f  y  GFalto = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Cambio de gas a %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Consumo de gas:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-Pres:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Techo calculado %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Tejido %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Parada de seguridad:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-Prof:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-CAS:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Parada de seguridad:tiempo desconocido @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco:Tiempo desconocido @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-En deco</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation>@: %d:%02d
+Prof: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation>Pres: %d%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation>T: %.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation>V: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation>CAS: %2.1fl/min
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-PEA:%d%s
-PNE:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation>CNS: %u%%
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation>pO%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-En deco (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation>pN%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation>pHe: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation>PMO: %d%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation>PEA: %d%s
+PNE: %d%s
+EADD: %d%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation>Parada de seguridad: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation>Parada de seguridad: tiempo desc @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation>Parada deco: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation>Parada deco: tiempo desc @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation>En deco</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation>NDL: %umin
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation>Parada deco: %umin @ %.0f%s (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation>En deco (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation>NDL: %umin (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation>TTS: %umin (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation>Techo calculado %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation>Tejido %.0fmin: %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation>Ritmo cardiaco: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation>Soporte: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sPres:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 inmersiones)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 inmersión)</translation>
     </message>
@@ -3222,142 +3511,142 @@ TTS:%umin (calc)</translation>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>más de %d días</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>para las inmersiones n.º</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>para las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>para la inmersión n.º %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>para la inmersión seleccionada</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>Todas las inmersiones</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(ninguna inmersión)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Ju</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Vi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mayo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -3387,187 +3676,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 ¿Está el Uemis Zúrich correctamente conectado?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Leyendo %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>datos</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>identificador de entrada del diario</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>identificador del punto de buceo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <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="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>traje húmedo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semiseco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>traje seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>chaleco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>chaleco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>traje completo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>traje completo 2 piezas</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Iniciar comunicación</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Fallo al intentar iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Iniciar la descarga</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Violación de parada de seguridad</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarma de velocidad</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Aviso de velocidad</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Aviso verde de PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Aviso de ascenso de PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarma de ascenso de PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Información sobre presión de botella</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Aviso tiempo de gas restante</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alerta tiempo de gas restante</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Sugerencia de cambio de botella</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Se superó el límite de profundidad</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Advertencia de tiempo max deco</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Información sobre la ruración de lainmersión</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alerta de duración de inmersión</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Marcador</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>No se degistran datos de botella</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Aviso de batería baja</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alerta de batería baja</translation>
     </message>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 92c1b8fdd..6c7740e5e 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Impordi fail (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Välja eraldaja</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Välja konfiguratsioon</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Impordi CSV fail</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Aeg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Sügavus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Peatuse sügavus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Eelseadistatud impordid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Ava CSV logifail</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Töörõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Algusrõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Lõpurõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Vaheta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Ballooni ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>kuupjalg</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Mudel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Seadme ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Hüüdnimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Siin klikkamine eemaldab selle kompuutri.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>õhk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Üleminek avatud süsteemile</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> algus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>õhk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>kuupjalga/min</translation>
     </message>
@@ -209,101 +174,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Näita otsinguakent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>laienda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>ahenda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>ahenda muud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <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="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>loo uus väljasõit ülal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <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="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>kustuta sukeldumine/sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Märgista sukeldumine/sukeldumised ebaõnnestunuks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>ekspordi UDDF kujul</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>nihuta ajad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>lae sukeldumised divelogs.de keskkonda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Salvesta sukeldumised nimega...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Salvesta fail nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF failid (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>ühenda valitud sukeldumised</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Välja eraldaja</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Välja konfiguratsioon</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Sügavus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Peatuse sügavus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Aeg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Ühikud</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>SI</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Briti/Ameerika</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Märgendid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Semu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Märkmed</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Raskus</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30 jalga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Draiveri asukoha viga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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,
@@ -370,37 +494,37 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>ÕHK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Lõppsügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Kasutatud gaas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC seadepunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Loobu plaanist?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Oled plaanist loobumas.</translation>
     </message>
@@ -408,85 +532,158 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Sukeldumise planeerija punktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Saadavad gaasid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>lisa sukeldumise andmete punkt</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>kuupäev</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Rõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>jalg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>nael</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>ülikond</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>ball</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>asukoht</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>kuupäev</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>jalg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>nael</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>ülikond</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>ball</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>asukoht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -494,115 +691,115 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Vigane vastus serverilt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Sukeldumiste listi üleslaadimine...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Sukeldumiste listi allalaadimine...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Laen alla %1 sukeldumist...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Allalaadimine lõppenud - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Vigane allalaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Üleslaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Üleslaadimine edukas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Sisselogimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Üleslaadimine lõppenud</translation>
     </message>
@@ -610,48 +807,54 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Korda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -719,7 +922,7 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Toimeta valitud sukeldumiskohad</translation>
     </message>
@@ -728,13 +931,13 @@ palun eemalda need esmalt.</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
@@ -760,11 +963,13 @@ palun eemalda need esmalt.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Vee temp</translation>
     </message>
@@ -790,7 +995,7 @@ palun eemalda need esmalt.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
@@ -901,92 +1106,102 @@ palun eemalda need esmalt.</translation>
         <translation>Sukeldumisi kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Balloonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Lisa balloon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Raskused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Lisa raskuste süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Väljasõidu koht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Väljasõidu märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Seda väljasõitu toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mitut sukeldumist toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Seda sukeldumist toimetatakse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -994,428 +1209,518 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Logi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Vaade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Abi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Uus logiraamat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Uus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Ava logiraamat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Ava</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Impordi failid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Eksport &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Väljastus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Välju</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Impordi &amp;sukeldumiskompuutrist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Toimeta seadmete nimesid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Nummerda ümber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>&amp;Suum sisse/välja</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Statistika &amp;aastate kaupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Sukeldumiste list</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profiil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Kasutusjuhend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Maakera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;laneeri sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Import CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Import CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Import Divelogs.de-st</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Lisa sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Autogrupeerimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>CTRL+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>CTRL+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Eelmine kompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Vasak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Uus kompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Parem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Vali sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Sisesta plaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Subsurface kohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Ava fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Kasutusjuhend</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Ei leia Subsurface juhendit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Salvesta muudatused?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Sulge käesolev toimetamine ja alles siis alusta järgmist.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF failid (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Aasta statistika</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ palun eemalda need esmalt.</translation>
         <translation>Kasuta vaikimisi ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>SI</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Isikupärasta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>meeter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>liiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Süsteemi vaikeväärtus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Rõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Maht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Ajaühikud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Laskumise/Tõusu kiiruse kordaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minutid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekundid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Näita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>lävi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Kompuutri teatatud lagi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>joonista lagi punasena</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Arvutatud lagi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>näita kõiki kudesid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m samm</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Arvuta NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFlow max sügavusel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Muu</translation>
     </message>
@@ -1697,37 +1980,32 @@ palun eemalda need esmalt.</translation>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Nõutav taaskäivitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Ava vaike logifail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML failid (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>&amp;Eelvaade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>P&amp;rindi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Väljastus</translation>
     </message>
@@ -1873,216 +2151,116 @@ palun eemalda need esmalt.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Lisa gaasivahetus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Lisa järjehoidja</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Eemalda sündmus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Peida sarnased sündmused</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Peida sündmused</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Peida kõik %1 sündmust?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Eemalda valitud sündmus?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>tundmatu kompuuter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Sea kestus: 10 minutit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Mõõtkava</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Joonlaud</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Mõõda sukeldumise segmentide atribuute</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Skaleeri sukeldumine ekraani mõõtu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Toimeta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>õhk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Üleminek avatud süsteemile</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> algus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> lõpp</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukeldumine #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Max sügavus: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Kestus: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Kasutatud gaas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Raskused:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Ülikond:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Nähtavus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Hinne:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Lisa gaasivahetus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Lisa järjehoidja</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Eemalda sündmus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Peida sarnased sündmused</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <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="36"/>
         <source>AIR</source>
         <translation>ÕHK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Eemalda see punkt</translation>
     </message>
@@ -2092,22 +2270,22 @@ palun eemalda need esmalt.</translation>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Miinimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <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>
@@ -2125,6 +2303,59 @@ palun eemalda need esmalt.</translation>
         <translation>Uus algusnumber</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Nihuta valitud sukeldumised</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>varasem</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>hilisem</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ palun eemalda need esmalt.</translation>
         <translation>Programmist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Sukeldumislogi tarkvara paljudele op-süsteemidele&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, jt, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Litsents</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Veebileht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Sulge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ palun eemalda need esmalt.</translation>
         <translation>Veebiteenus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Ühendab...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Allalaadimine lõppenud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Allalaadimise viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Viga ühendamisel:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Vale kasutaja ID!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Allalaadimine õnnestus!</translation>
     </message>
@@ -2230,17 +2466,17 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Info</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Kasutusjuhend</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Ei leia Subsurface juhendit</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ palun eemalda need esmalt.</translation>
         <translation>Sisesta oma ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Allalaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Kasutaja ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Salasõna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Üleslaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Toiming aegus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Andmete ülekanne...</translation>
     </message>
@@ -2317,117 +2566,117 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Aasta
  &gt; Kuu / väljasõit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Kestus
 kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Lühim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Pikim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Sügavus (%1)
 keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Miinimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2443,25 +2692,25 @@ Maksimum</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
@@ -2494,17 +2743,17 @@ Maksimum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) või (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
@@ -2536,20 +2785,16 @@ Maksimum</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>&apos;%s&apos; lugemine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>&apos;%s&apos; lugemine ebaõnnestus. Kasuta CSV failide importi.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>CSV impordil on max toetatud veergude arv %d</translation>
     </message>
@@ -2691,17 +2936,17 @@ Maksimum</translation>
         <translation>vale sündmuse nr</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Viga andmete registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
@@ -2716,133 +2961,158 @@ Maksimum</translation>
         <translation>Viga põhjaaja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Viga pinnarõhu saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Sündmus: ootan kasutaja sekkumist</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Ei saa avada %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Imelik protsendilugem %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>&apos;%s&apos; tuvastamine ebaõnnestus.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>&apos;%s&apos; tuvastamine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Andmebaasi päring get_events ebaõnnestus.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Andmebaasi ühendus ebaõnnestus &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Andmebaasi päring ebaõnnestus &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Ei leia gaasi %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Liiga palju gaasisegusid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,272 +3125,261 @@ põhineb väärtustel GFlow = %.0f ja GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Mine üle %s gaasile
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Gaasi tarbimine:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s of %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Arvutatud lagi %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Tissue %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Ohutuspeatus:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Ohutuspeatus:teadmata aeg @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deko:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deko:teadmata aeg @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-Dekos</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s⏎ pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-Dekos (arvutatud)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (arvutatud)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (arvutatud)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 sukeldumist)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 sukeldumine)</translation>
     </message>
@@ -3220,142 +3479,142 @@ TTS:%umin (arvutatud)</translation>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>enam kui %d päeva</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>sukeldumiste nr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>valitud sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>sukeldumise nr %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>valitud sukeldumise</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>kõikide sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(pole sukeldumisi)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Pühap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Esmasp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Teisip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Kolmap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Neljap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Reede</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Laup</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Jaan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Veebr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Märts</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Juuni</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Juuli</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dets</translation>
     </message>
@@ -3384,187 +3643,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Kas Uemis Zurich on ühendatud korrektselt?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Loen %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>andmed</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>logi kirje ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>sukeldumiskoha andmete ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>rohkem sukeldumisandmete ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>märgülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>poolkuiv</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>kuivülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>lühike ülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>pikk john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>täisülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2-osaline täisülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membraan</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Algata ülekanne</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis alglaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Alusta allalaadimist</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Ohutuspeatuse rikkumine</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Kiiruse alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Kiiruse hoiatus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>PO2 roheline hoiatus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>PO2 tõusu hoiatus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>PO2 tõusu alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Balloonirõhu info</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>RGT hoiatus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>RGT häire</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Soovitus balloonivahetuseks</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Sügavuse limiit ületatud</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Max dekoaja hoiatus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Põhjaaja info</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Põhjaaja hoiatus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Tähis</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Pole ballooni andmeid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Patarei tühjenemise hoiatus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Patarei tühjenemise häire</translation>
     </message>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 20f505c0c..9716a55d1 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Liitä tiedot CSV-tiedostosta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Kentän erotin</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Kentän määritys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Liitä CSV -tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Kello</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Syvyys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Pysähdyssyvyys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Esiasetetut tuonnit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Avaa CSV-tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV -tiedostot (*.csv);;Kaikki tiedostot(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Paineluokka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Alkupaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Loppupaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Vaihda syvyydessä</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Säiliötä ei voida poistaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>ft³</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Malli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Laite ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Lempinimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Poista sukellustietokone.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>ilma</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Vaihto avoimeen ilman kiertoon</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>alku</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>ilma</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>jalkaa/min</translation>
     </message>
@@ -209,101 +174,260 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Näytä hakukenttä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>laajenna kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>supista kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>supista muut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>erota sukellukset retkestä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>luo uusi retki yläpuolelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>liitä retki yllä olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>liitä retki alla olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>poista sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Merkitse sukellukset epäkelvoiksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>vie UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>muuta aikoja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>lähetä sukellukset divelogs.de -sivustolle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Tallenna sukellukset nimellä...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>yhdistä valitut sukellukset</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Kentän erotin</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Kentän määritys</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Syvyys</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Pysähdyssyvyys</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Kello</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <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"/>
+        <source>Metric</source>
+        <translation>Metrinen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Brittiläinen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Ajankohta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Sukelluspari</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Painot</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30 jalkaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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,
@@ -370,37 +494,37 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Lopullinen syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Käytetty kaasuseos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CCR-asetuspiste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Hylätäänkö suunnitelma?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Olet hylkäämässä suunnitelmasi.</translation>
     </message>
@@ -408,85 +532,158 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Sukellussuunnitelman etappipisteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Mahdolliset kaasut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>lisää sukellusetappi</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>päiväys</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>pauna</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>puku</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>säiliöt</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>kohde</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>PHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>päiväys</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>pauna</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>puku</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>säiliöt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>kohde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -494,115 +691,115 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Virheellinen vastaus palvelimelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>sukelluksia ei ole valittu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>zip -tiedoston luonti vientiä varten epäonnistui: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>väliaikaistiedoston luominen ei onnistu: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>sisäinen virhe: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>sisäinen virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Lähetetään sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Ladataan sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Ladataan %1 sukellusta...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Lataus päättynyt - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Lataus on korruptoitunut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Lähetys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Lähetys onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Kirjautuminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Virhe: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Lähetys valmistui</translation>
     </message>
@@ -610,48 +807,54 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Yritä uudestaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Lokitiedostot (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Raakatiedostot (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Muokkaa valittuja sukelluskohteita</translation>
     </message>
@@ -728,13 +931,13 @@ poista ensin pysähdykset.</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
@@ -760,11 +963,13 @@ poista ensin pysähdykset.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Veden lämpötila</translation>
     </message>
@@ -790,7 +995,7 @@ poista ensin pysähdykset.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
@@ -901,92 +1106,102 @@ poista ensin pysähdykset.</translation>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Lisää painojärjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Matkakohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Tätä sukellusretkeä muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Muokataan useita sukelluksia.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Tätä sukellusta muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -994,428 +1209,518 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>Loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>Näkymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>Apua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>Liitä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>Uusi loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Avaa loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Avaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Tallenna nimellä...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Liitä tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Vie UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Hae sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>Muokkaa laitenimiä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>Uudellennumeroi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Venytä sukellusprofiilikuvaajaa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Sukelluslista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profiilikuvaaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Maapallo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Sukelluksen suunnittelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Liitä CSV-tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Liitä CSV-tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Tuo Divelogs.de -sivustolta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Lisää sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Ryhmittele automaattisesti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Edellinen tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Vasen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Seuraava tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Oikea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Valitse tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Suunnittele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Käyttöohje</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Subsurfacen käyttöohje ei löydy</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Tallenna muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Viimeistele tämänhetkinen muokkaus, ennen kuin aloitat uuden.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Vuositilastot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ poista ensin pysähdykset.</translation>
         <translation>Käytä oletussäiliötä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Mukauta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>metri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>jalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>litra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>kuutiojalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Järjestelmän oletus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Aikayksiköt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Nousu/laskunopeuden yksikkö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minuuttia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekuntia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>kynnys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Sukellustietokoneen raportoima kattosyvyys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>piirrä kattosyvyys punaisella</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Laskettu kattosyvyys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>näytä kaikki kudokset</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m portaat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Laske NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow maksimisyvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Sekalaiset</translation>
     </message>
@@ -1697,38 +1980,33 @@ poista ensin pysähdykset.</translation>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>Pintakulutus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Vaaditaan uudelleenkäynnistys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Avaa oletustiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1736,22 +2014,22 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Esikatselu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
@@ -1874,216 +2152,116 @@ poista ensin pysähdykset.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Lisää kaasun vaihto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Lisää kirjanmerkki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Poista tapahtuma</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Piilota samankaltaiset tapahtumat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Näytä kaikki tapahtumat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Piilota tapahtumat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Piilota kaikki %1 tapahtumat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Poistetaanko valitut tapahtumat?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>tuntematon sukellustietokone</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Aseta kesto: 10 minuuttia</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Mittakaava</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Viivain</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Mittaa sukellusetappien ominaisuuksia</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Laajenna profiili tilan mukaan</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Muuta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>ilma</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Vaihto avoimeen ilman kiertoon</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>alku</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>loppu</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukellus #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Suurin syvyys: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Kesto: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Kaasu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Painot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Sukellusvanhin:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Yleisarvio:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Lisää kaasun vaihto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Lisää kirjanmerkki</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Poista tapahtuma</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Piilota samankaltaiset tapahtumat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Näytä kaikki tapahtumat</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>Ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Poista tämä etappi</translation>
     </message>
@@ -2093,22 +2271,22 @@ poista ensin pysähdykset.</translation>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Alin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Korkein</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation>
     </message>
@@ -2126,6 +2304,59 @@ poista ensin pysähdykset.</translation>
         <translation>Uusi aloitusnumero</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Muuta valittujen aikaa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>aiemmin</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>myöhemmin</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2162,20 +2393,25 @@ poista ensin pysähdykset.</translation>
         <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Sukelluslokiohjelmisto useille käyttöjärjestelmäalustoille&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>Lisenssi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>Websivu</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Sulje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2185,37 +2421,37 @@ poista ensin pysähdykset.</translation>
         <translation>Verkkopalvelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Yhdistetään...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Lataus valmistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Virhe latauksessa: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Yhteysvirhe:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Tuntematon käyttäjä!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Lataus onnistui!</translation>
     </message>
@@ -2231,17 +2467,17 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2249,20 +2485,33 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Tiedot</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Käyttöohje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Subsurfacen käyttöohje ei löydy</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2285,32 +2534,32 @@ poista ensin pysähdykset.</translation>
         <translation>Syötä käyttäjätunnus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Lataa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Käyttäjätunnus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Lähetä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Toimenpide ei valmistunut ajoissa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Tietoa siirretään...</translation>
     </message>
@@ -2318,117 +2567,117 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Vuosi
 &gt; Kuukausi / Retki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Kesto
 Kokonais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Lyhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Pisin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dyvyys (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Alin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Suurin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Lämpö (%1)
@@ -2444,25 +2693,25 @@ Keski</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -2495,17 +2744,17 @@ Keski</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) tai (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>ilma</translation>
     </message>
@@ -2537,20 +2786,16 @@ Keski</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui. Käytä Liitä -toimintoa CSV -tiedostoille</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation>
     </message>
@@ -2692,17 +2937,17 @@ Keski</translation>
         <translation>tuntematon tapahtumanumero</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Virhe ajan jäsentämisessä</translation>
     </message>
@@ -2717,133 +2962,158 @@ Keski</translation>
         <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Outo prosenttiosuus: %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <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="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Tietokantayhteys epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Tietokantakysely epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Tyylitiedoston %1 avaus ei onnistu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Seosta %d/%d ei löydy</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Liian monta kaasuseosta</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2856,274 +3126,262 @@ perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Vaihda kaasu seuraavaan: %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Kaasun kulutus:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f %s (%s)
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P: %d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T: %.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-N:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Laskettu katto %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Kudos %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Turvapysähdys: %u min @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-S:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Turvapysähdys: tuntemat. aika @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deko: %u min @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deko: tuntem. aika @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-dekossa</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL: %u min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS: %u %%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s: %.2f bar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s: %.2f bar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe: %.2f bar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD: %d %s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD: %d %s
-END: %d %s
-EADD: %d %s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (lask.)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-Dekossa (lask.)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (lask.)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (lask.)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sA: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sS:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sS:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %3.%2.%4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%2.%1.%3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dive)</translation>
     </message>
@@ -3223,142 +3481,142 @@ TTS:%umin (lask.)</translation>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>yli %d päivää</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%d pv %d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>sukellukselle numero </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>Sukellus #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>valittu sukellus</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>kaikille sukelluksille</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(ei sukelluksia)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>su</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>ti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>ke</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>to</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>pe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>la</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>tammi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>helmi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>maalis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>huhti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>touko</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>kesä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>heinä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>elo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>syys</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>loka</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>marras</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>joulu</translation>
     </message>
@@ -3388,187 +3646,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Onko Uemis Zurich kytketty oikein?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Luetaan sukellusta %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>tieto</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>id: sukelluslokimerkintä</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>id: lisää sijaintitietoa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>id: lisää sukellusdataa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>märkäpuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>puolikuiva</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>kuivapuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>lyhyt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>liivi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>haalari</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>takki</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>kokopuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>Kaksiosainen kokopuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>laminaatti</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Muodosta yhteys</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemiksen lukeminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Aloita lataus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Turvapysähdyksen laiminlyönti</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Hälytys: nousunopeus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Varoitus: nousunopeus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Varoitus: hapen osapaine (green)</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Varoitus: hapen osapaine</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Hälytys: hapen osapaine</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Tiedotus: säiliöpaine</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Varoitus: kaasumäärä</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Hälytys: kaasumäärä</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Säiliönvaihtoehdotus</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Syvyysraja ylitetty</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Varoitus: etappipysähdysaika</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Tiedotus: sukellusaika</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Hälytys: sukellusaika</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>merkki</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Ei tietoja säiliöistä</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Varoitus: heikko paristo</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Hälytys: heikko paristo</translation>
     </message>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index cdf648b59..76a182e3d 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importer un fichier (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Séparateur de champs</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Configurations des champs</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importer un fichier CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Temps</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Profondeur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>SNC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Profondeur d’arrêt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Importations préconfigurées</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Ouvrir un fichier CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>Fichiers CSV (*.csv);;Tous les fichiers (*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Press. Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Press. Début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Press. Fin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Changement à</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Le bloc ne peut être retiré.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>pied³</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modèle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Identifiant du périphérique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Cliquer ici retirera cet ordinateur de plongée.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>air</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Passer en CO</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> début</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>air</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -209,101 +174,260 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Montrer la barre de recherche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>tout déplier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>tout replier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>replier les autres</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>retirer plongée(s) du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>créer un nouveau groupe au-dessus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <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="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>supprimer plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <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="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Exporter comme un fichier UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>décaler l&apos;heure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Télécharger la/les plongée(s) vers divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Enregistrer les plongées sous...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>fusionner les plongées sélectionnées</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Séparateur de champs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Configurations des champs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Profondeur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Profondeur d’arrêt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Temps</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>SNC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <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"/>
+        <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"/>
+        <source>Imperial</source>
+        <translation>Impérial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Étiquettes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Lieu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Binôme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Poids</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Gestion des positions problématiques</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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,
@@ -370,37 +494,37 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Profondeur Finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gaz Utilisé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>Recycleur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Annuler la planification ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Vous allez annuler la planification.</translation>
     </message>
@@ -408,85 +532,158 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Point planifiés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Gaz disponibles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>Ajouter un point de donnée</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>N°</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>date</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Temps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Pression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>pied</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>livre US</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>combinaison</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>blk</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>lieu</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>N°</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>date</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>pied</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>livre US</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>combinaison</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>blk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>lieu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>Consommation d&apos;air</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>SNCmax</translation>
     </message>
@@ -494,115 +691,115 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Réponse invalide du serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>Aucune plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>Erreur de création du fichier zip pour téléchargement : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>Impossible de créer le fichier temporaire : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>Erreur interne : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>Erreur interne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <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="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <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="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <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="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Téléchargement terminé - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Téléchargement corrompu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Echec du téléchargement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Téléchargement terminé avec succès</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Echec de connexion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Impossible d&apos;analyser la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Erreur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Téléchargement terminé</translation>
     </message>
@@ -610,48 +807,54 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Essayer à nouveau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Fichier de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Fichiers de décharge (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Modifier le lieu de la plongée sélectionnée</translation>
     </message>
@@ -728,13 +931,13 @@ 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="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
@@ -760,11 +963,13 @@ Veuillez d&apos;abord les supprimer.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Temp. eau</translation>
     </message>
@@ -790,7 +995,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -901,92 +1106,102 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Blocs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Ajouter un bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Ajouter un système de poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Lieu du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Notes du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <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="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <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="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <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="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -994,428 +1209,518 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Journal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Vue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nouveau carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Ouvrir un carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Maj+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importer des fichiers</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Exporter &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <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="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <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="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renuméroter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Changer de &amp;zoom</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Liste de plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Informations</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Manuel d&apos;utilisation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lannification de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importer un fichier CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importer un fichier CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importer depuis divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Ajouter une plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Groupement automatique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Ordinateur précédent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Ordinateur suivant</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Sélection des événements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Saisir le plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>À propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Ouvrir un Fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Manuel utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Impossible de trouver le manuel de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Enregistrement des changements ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Veuillez finir votre modification en cours avant d&apos;en faire une autre.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Statistiques annuelles</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Utiliser le bloc par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personnalisé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>mètre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>litre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>pied cubique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Paramètre par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Pression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Unités de temps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <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="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Secondes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Montrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>limite</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>ppO₂ maximum</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Plafond signalé par l&apos;ordinateur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>Afficher en rouge le plafond</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Plafond calculé</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>montrer tous les tissus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>incréments de 3m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Calculer LND/TRS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow à la profondeur max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
@@ -1697,37 +1980,32 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>Consommation d&apos;air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Redémarrage necessaire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>&amp;Prévisualisation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>&amp;Impression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Imprimer</translation>
     </message>
@@ -1873,216 +2151,116 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Ajouter un changement de mélange</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Ajouter un signet</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Supprimer l&apos;événement</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Cacher les événements similaires</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Dé-sélectionner tous les évènements</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Cacher les événements</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Cacher tous les événements %1 ?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Supprimer l&apos;événement sélectionné ?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>ordinateur inconnu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Réglez la durée : 10 minutes</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Échelle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Règle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Mesure des propriétés d&apos;une partie de la plongée</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Ajuster la plongée à la taille de l&apos;écran</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Editer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Passer en CO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> début</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> fin</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Plongée #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Profondeur max: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Durée: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Gaz utilisé:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>Consommation d&apos;air:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>SNC Max.:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Poids:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Chef de palanquée:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Binôme:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Combinaison:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Visi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Évaluation:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Ajouter un changement de mélange</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Ajouter un signet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Supprimer l&apos;événement</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Cacher les événements similaires</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Dé-sélectionner tous les évènements</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Supprimer ce point</translation>
     </message>
@@ -2092,22 +2270,22 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <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>
@@ -2125,6 +2303,59 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Nouveau numéro de départ</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Décaler l&apos;heure</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>plus tôt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>plus tard</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>À propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Journal de plongée multi-plateforme&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Licence</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>Site &amp;web</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Fermer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Connexion en cours...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Téléchargement terminé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Erreur de téléchargement: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Erreur de connexion : </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Identifiant utilisateur incorrect.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Impossible de lire la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Téléchargement réussi</translation>
     </message>
@@ -2230,17 +2466,17 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Manuel utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Impossible de trouver le manuel de Subsurface</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Entrez votre ID ici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>ID utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <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="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Transfert des données en cours</translation>
     </message>
@@ -2317,117 +2566,117 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Année
 &gt; Mois / Groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Durée
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Plus longue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Pronfondeur (%&amp;)
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2443,25 +2692,25 @@ Moyenne</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>pied³</translation>
     </message>
@@ -2494,17 +2743,17 @@ Moyenne</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -2536,20 +2785,16 @@ Moyenne</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Impossible de la lecture « %s »</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Impossible de lire &apos;%s&apos;. Veuillez utiliser l&apos;importation de fichier CSV.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Le nombre maximal de colonnes supporté pour les importations de fichiers CSV est %d.</translation>
     </message>
@@ -2691,17 +2936,17 @@ Moyenne</translation>
         <translation>numéro d&apos;événement non valide</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Impossible d&apos;enregistrer les données</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Impossible d&apos;analyser l&apos;heure</translation>
     </message>
@@ -2716,133 +2961,158 @@ Moyenne</translation>
         <translation>Impossible d&apos;analyser le temps de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Impossible d&apos;obtenir la salinité de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erreur à l&apos;obtention de la pression en surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Impossible d&apos;analyser le mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Impossible d&apos;analyser des échantillons</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <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="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <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="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <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="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <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="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Valeur de pourcentage étrange %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Impossible d&apos;analyser « %s ».
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossible d&apos;analyser « %s »</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Échec de la requête.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Connexion à la base de données impossible &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Échec de la requête &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <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="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>Nitrox%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Impossible de trouver le gaz %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Trop de gaz différents</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,274 +3125,262 @@ basé sur un GFlow = %.0f et un GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Changer pour du gaz %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Consommation de gaz :
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P : %d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T : %.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Plafond calculé %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Tissu %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Arrêt de sécurité : %umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-P:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Arrêt de sécurité : durée inconnue @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Décompression : %umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Décompression : durée inconnue @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-En décompression</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-LND : %umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-SNC : %u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s : %.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s : %.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe : %.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD : %d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD : %d%s
-END : %d%s
-EADD : %d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-En déco (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-LND:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TRS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sPd:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sPd:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 plongées)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 plongée)</translation>
     </message>
@@ -3222,142 +3480,142 @@ TRS:%umin (calc)</translation>
         <translation>décompression</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>plus de %d jours</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%d j %d h %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%d h %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>pour les plongées n°</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>uniquement les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>pour la plongée n°%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>uniquement la plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>pour toutes les plongées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(pas de plongées)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Dim.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Lun.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Mer.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Jeu.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Ven.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sam.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Janv.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Fév.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Avril</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Juin</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Juil.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Août</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Sept.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Oct.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Déc.</translation>
     </message>
@@ -3387,187 +3645,187 @@ 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="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Lecture %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>données</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>identifiant de l&apos;entrée dans le journal</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>identifiant du site de plongée</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>plus d&apos;identifiants de plongée</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>combinaison humide</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semi-étanche</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>Combinaison sèche</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>veste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>salopette de combinaison</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>gilet</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>Combinaison intégrale</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>Combi 2 pièces</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membrane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Initialisation de la communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Impossible d&apos;initialiser Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Début du téléchargement</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Violation du palier de sécurité</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarme de vitesse</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Avertissement de vitesse</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Avertissement PO2 Vert</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Avertissement PO2 ascendant</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarme PO2 ascendant</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Pression du bloc</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Avertissement temps d&apos;air restant</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alerte temps air restant</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Changement de bloc suggéré</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Profondeur plafond dépassée</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Avertissement de temps de décompression max</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alerte temps de plongée</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Marqueur</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Pas d&apos;information sur le bloc</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Avertissement de batterie faible</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarme de batterie faible</translation>
     </message>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 2161bb23c..45a2689c7 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>יבוא קובץ (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>יבוא קובץ CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>זמן</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>עומק</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>טמפ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>לפתוח יומן קבצי CSV  </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV קבצי (*.csv);;כל הקבצים(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>גודל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>לחץ עבודה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>לחץ התחלתי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>לחץ סופי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -172,35 +94,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>דגם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>מזהה התקן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>כינוי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>אוויר</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>מעבר חרום למערכת נשימה פתוחה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>להתחיל</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>אוויר</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>ליטר לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>רגל מעוקב לדקה</translation>
     </message>
@@ -208,101 +173,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>הצג חיפוש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>הצג הכל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>הסתר הכל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>מחיקת צלילה/צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>לא להתחשב בצלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>שמור בשם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>יצוא כקובץ UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>העלה צלילות לאתר divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>שמור צלילות בשם...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>שמור קובץ בשם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF קבצי (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>אחד צלילות נבחרות</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>עומק</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>זמן</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>טמפ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>יחידות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>מידה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>אמריקאית</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>תאריך</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>תגיות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>בן זוג</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>משקל</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -344,22 +468,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30 רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>שגיאת מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
         <translation>עצירה אחת או יותר יאבדו בפעולה זו
@@ -369,37 +493,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>עומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>אוויר שנוצל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>למחוק תוכנית?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation>
     </message>
@@ -407,201 +531,274 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>עומק</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>זמן</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>לחץ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>טמפרטורה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation>צריכת אויר</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
         <source>date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
         <source>min</source>
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
         <source>suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
         <source>location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>SAC</source>
         <translation>צריכת אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
-        <translation type="unfinished"/>
+        <translation>רעילות שייורית מקסימלית</translation>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>תגובה לא חוקית מהשרת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>תגובת XML פגומה. שורה %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>שום צלילות נבחרו</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>נכשל ביצירת קובץ zip להעלאה: 1%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>לא ניתן ליצור קובץ זמני: 1%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>שגיאה פנימית: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>שגיאה פנימית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>סיים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>העלאת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>הורדת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>הורדת 1% צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>ההורדה הסתיימה - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>הורדה פגומה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>לא היה אפשרות לפתוח את הארכיון:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>ההעלאה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>ההעלאה הסתיימה בהצלחה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>שגיאת התחברות (הזדהות)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>תשובה לא ברורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>שגיאה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>ההעלאה הסתיימה</translation>
     </message>
@@ -609,50 +806,56 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>אשר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>שגיאה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>נסה שוב</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>קבצי יומן (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
-        <translation type="unfinished"/>
+        <translation>קבצי Dump (*.bin)</translation>
     </message>
 </context>
 <context>
@@ -718,7 +921,7 @@ Please, remove them first.</source>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation type="unfinished"/>
     </message>
@@ -727,13 +930,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>הערות צלילה</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
@@ -759,11 +962,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>טמפ&apos; האוויר</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>טמפ&apos; מים</translation>
     </message>
@@ -789,7 +994,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
@@ -900,92 +1105,102 @@ Please, remove them first.</source>
         <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>מיכלים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>הוסף מיכל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>משקולות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>הוסף מערכת משקולות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>צלילות מרובות בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>צלילה זו בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>צ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>ד</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>מז</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>מע</translation>
     </message>
@@ -993,428 +1208,518 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>פילטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;קובץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;יומן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;עזרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;ייבא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>יומן &amp;חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;לפתוח יומן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>שמור בשם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>ייבא קבצים</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>יצוא &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
-        <source>&amp;Print</source>
-        <translation>&amp;הדפס</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;צא</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation>&amp;הדפס</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;צא</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;מספר מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;סטטיסטיקה שנתית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>רשימת צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>פרופיל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>פרטים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>כולם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;מדריך משתמש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>גלובוס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>ת&amp;כנן צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>יבוא CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>יבוא CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>יבוא מ- Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>העדפות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>הוסף צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>קבץ אוטומטי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>קודם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>שמאל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>הבא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>ימין</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>בחירת אירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>הכנסת תכנית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>אודות Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>פתך קובץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>מדריך משתמש</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>קובץ המדריך למשתמש לא נמצא</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>לשמור שינויים?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>ראשית תסיים את המהדורה הנוכחית לפני שאתה מנסה לעשות אחר.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>שמור קובץ בשם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF קבצי (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1484,209 +1789,187 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>מערכת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>התאמה אישית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>ליטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>רגל מ&quot;ק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>צלסיוס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>פרנהייט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>ברירת מחדל של המערכת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>פילטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>לחץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>נפח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>יחידות זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>מקדם עליה וירידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>הצג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>סף</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>לחץ הליום</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>ppO₂ המקסימאלי</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>עומק מקסימלי שדווח ע&quot;י מחשב הצלילה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>סמן עומק מקסימלי באדום</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>עומק מקסימלי מחושב</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>הצג כל סוגי רקמות</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>רווחים של 3 מטר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>שונות</translation>
     </message>
@@ -1696,37 +1979,32 @@ Please, remove them first.</source>
         <translation>העדפות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>צריכת אויר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>גרדיאנט עליון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>נדרשת הפעלה מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>פתח יומן ברירת מחדל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1734,22 +2012,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>&amp;תצוגה מקדימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>ה&amp;דפס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>הדפס</translation>
     </message>
@@ -1872,216 +2150,116 @@ Please, remove them first.</source>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>הסר את האירוע</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>הסתר אירועים דומים</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>חשוף את כל האירועים</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>הסתר אירועים</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>הסתר את כל %1 האירועים</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>הסר את האירוע שנבחרו?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>מחשב צלילה לא מוכר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>קבע זמן: 10 דקות</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>קנה מידה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>סרגל</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>ערוך</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>לחץ הליום</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>אוויר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>להתחיל</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>סוף</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>צלילות מס %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>עומק מקסימלי: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>זמן: %1 דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>אוויר שנוצל:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>צריכת אויר:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>משקולות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>הערות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>מדריך צלילה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>בן זוג:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>חליפה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>ראות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
+        <translation>דירוג</translation>
+    </message>
+</context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>הוספת סימנייה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>הסר את האירוע</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>הסתר אירועים דומים</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>חשוף את כל האירועים</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation type="unfinished"/>
     </message>
@@ -2091,22 +2269,22 @@ Please, remove them first.</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation>
     </message>
@@ -2124,6 +2302,59 @@ Please, remove them first.</source>
         <translation>מספר התחלתי חדש</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>מוקדם יותר</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>מאוחר יותר</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2160,20 +2391,25 @@ Please, remove them first.</source>
         <translation>אודות Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;רישיון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;אתר אינטרנט</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;סגור</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2183,37 +2419,37 @@ Please, remove them first.</source>
         <translation>שרות איטרנט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>מתחבר...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>ההורדה הסתיימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>שגיאת חיבור:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>שם משתמש לא חוקי!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>תשובה לא מובנת!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>ההורדה הצליחה!</translation>
     </message>
@@ -2229,17 +2465,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2247,20 +2483,33 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>מידע נוסף</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>מדריך משתמש</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>קובץ המדריך למשתמש לא נמצא</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
@@ -2283,32 +2532,32 @@ Please, remove them first.</source>
         <translation>הכנס זיהוי כאן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>הורדה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>זיהוי משתמש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>סיסמא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>ההעלאה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>הפעולה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>מעביר נתונים...</translation>
     </message>
@@ -2316,117 +2565,117 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>מטר</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>שנה
 &gt; חודש / טיול</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>משך
 כולל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 קצר ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 ארוך ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>עומק (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>צריכת אויר (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>טמפ&apos; (%1)
@@ -2442,25 +2691,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2493,17 +2742,17 @@ Maximum</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%S) או (%S)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>אוויר</translation>
     </message>
@@ -2535,20 +2784,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>קריאה מ&apos;%S&apos; נכשלה</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -2565,7 +2810,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>rbt</source>
-        <translation type="unfinished"/>
+        <translation>זמן נותר בעומק</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
@@ -2595,7 +2840,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>bookmark</source>
-        <translation type="unfinished"/>
+        <translation>סימניה</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
@@ -2690,19 +2935,19 @@ Maximum</source>
         <translation>מס&apos; ארוע שגוי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished"/>
+        <translation>לא מצליח להבין %s %s </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה ברישום המידע</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בקריאת תאריך</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="433"/>
@@ -2712,134 +2957,159 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="438"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בקריאת זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="456"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בקריאת תערובת גזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>שגיאה בקבלת מליחות מים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בקבלת לחץ על פני המים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בקריאת נקודות דגימה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>אירוע: מחכה לפעולה של המשתמש</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה ברישום שגרת ניהול</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>שגיאת יבוא נתוני צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>לא ניתן לפתוח את %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>שאילתת מסד נתונים של Get_events נכשל
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>החיבור למסד הנתונים נכשל &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>שאילתת מסד נתונים נכשל &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>לא ניתן למצוא את הגז %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2848,251 +3118,258 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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="551"/>
+        <location filename="../planner.c" line="554"/>
         <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="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>לעבור לגז s%
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>צריכת דלק:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-דקומפרסיה:%uדקות @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-דקומפרסיה: זמן לא ידוע @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-בתוך דקומפרסיה</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
+        <source>P: %d%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
+        <source>T: %.1f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
+        <source>SAC: %2.1fl/min
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 צלילות)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 צלילה)</translation>
     </message>
@@ -3192,142 +3469,142 @@ TTS:%umin (calc)</source>
         <translation>דקומפרסיה</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>יותר מ-%d ימים</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>לצלילות #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>לצלילות שנבחרו</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>לצלילה #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>לצלילה שנבחרה</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>לכל הצלילות</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(שום צלילות)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>ראשון</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>שני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>שלישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>רביעי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>חמישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>שישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>שבת</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>ינואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>פבואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>מרץ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>אפריל</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>מאי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>יוני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>יולי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>אוגוסט</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>ספטמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>אוקטובר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>נובמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>דצמבר</translation>
     </message>
@@ -3352,187 +3629,187 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>קורא %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>נתונים</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>חליפת צלילה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>חליפה יבשה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>אפוד</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>לבנים ארוכים</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>ז&apos;קט</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>חליפה מלאה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>ממברנה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>התחל הורדה</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>אזעקת מהירות</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>אזהרת מהירות</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>אזהרת RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>התראת RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>אזהרת סוללה חלשה</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>התראת סוללה חלשה</translation>
     </message>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 5be6c7df8..ca1e69856 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="hr_HR" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Vrijeme</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Dubina</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Veličina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -172,35 +94,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Naziv uređaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>zrak</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Neplanirani prelazak na OC sustav</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> započni</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>zrak</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -208,107 +173,266 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Dubina</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Vrijeme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Jedinice</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Bilješke</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Težina</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="85"/>
@@ -344,22 +468,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
         <translation type="unfinished"/>
@@ -368,37 +492,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -406,85 +530,158 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>Br.</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Vrijeme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Pritisak</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>Br.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -492,114 +689,114 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -607,48 +804,54 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Pokušaj ponovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -716,7 +919,7 @@ Please, remove them first.</source>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation type="unfinished"/>
     </message>
@@ -725,13 +928,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
@@ -757,11 +960,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation type="unfinished"/>
     </message>
@@ -787,7 +992,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
@@ -898,92 +1103,102 @@ Please, remove them first.</source>
         <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Boce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -991,428 +1206,518 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Novi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Spremi kao</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
-        <source>Ctrl+U</source>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
-        <source>&amp;Print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
-        <source>Ctrl+,</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Informacije</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Prethodno računalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Sljedeće računalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Odaberi događaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Unesi plan urona</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>O programu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Otvori datoteku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Korisnički priručnik</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Spremi promjene?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Godišnje statistike</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1482,209 +1787,187 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Pritisak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1694,37 +1977,32 @@ Please, remove them first.</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1732,22 +2010,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1870,216 +2148,116 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Uredi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>zrak</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Neplanirani prelazak na OC sustav</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> započni</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> završi</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <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="36"/>
         <source>AIR</source>
         <translation>Zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation type="unfinished"/>
     </message>
@@ -2089,22 +2267,22 @@ Please, remove them first.</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -2122,6 +2300,59 @@ Please, remove them first.</source>
         <translation>Novi početni broj</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2158,20 +2389,25 @@ Please, remove them first.</source>
         <translation>O programu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2181,37 +2417,37 @@ Please, remove them first.</source>
         <translation>Web servis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Spajanje...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Greška u komunikaciji: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Neispravna korisnička oznaka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Ne mogu obraditi odziv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Preuzimanje uspješno!</translation>
     </message>
@@ -2227,17 +2463,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2245,20 +2481,33 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Korisnički priručnik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2281,32 +2530,32 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation type="unfinished"/>
     </message>
@@ -2314,108 +2563,108 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -2430,25 +2679,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2481,17 +2730,17 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ili (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>zrak</translation>
     </message>
@@ -2523,20 +2772,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Nije uspjelo čitanje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -2678,17 +2923,17 @@ Maximum</source>
         <translation>neispravan broj događaja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Greška pri registraciji podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
@@ -2703,133 +2948,158 @@ Maximum</source>
         <translation>Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Događaj: čekanje na korisničku akciju</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Greška pri registraciji event handlera.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Greška pri uvozu podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Neobično očitanje postotka %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Nije uspjelo parsiranje &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nije uspjelo parsiranje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Neuspjeo get_events na bazi.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Neuspjelo spajanje na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Neuspjeo upit na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Ne mogu naći plin %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Previše mješavina plinova</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2842,264 +3112,260 @@ temeljen na GFlow = %.0f i GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Prebaci plin na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Potrošnja plina:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-D:%d %s</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
+        <location filename="../profile.c" line="1234"/>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
+        <location filename="../profile.c" line="1238"/>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1247"/>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Izračunati strop %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
+        <source>Calculated ceiling %.0f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Sigurnosni zastanak:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Sigurnosni zastoj:nepoz.vrijeme @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deko:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deko:nepoznato vrijeme @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-U deko</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
@@ -3199,142 +3465,142 @@ TTS:%umin (calc)</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>više od %d dana</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>za urone #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>za odabrane urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>za uron #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>za odabrani uron</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>za sve urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(nema urona)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Uto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Sri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sub</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Sij</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Velj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Ožu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Tra</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Svi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Srp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Kol</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Ruj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Stu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Pro</translation>
     </message>
@@ -3364,187 +3630,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Je li Uemis Zurich ispravno priključen?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Čitanje %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>podaci</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>ID unosa u dnevniku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>divespot data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>više podataka za ID urona</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>mokro odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>polusuho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>suho odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>jakna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>kompenzator plovnosti</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>puno odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>dvodjelno odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Uspostavljanje veze</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis greška pri inicijalizaciji</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Započni preuzimanje</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Kršenje sigurnosne stanke</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm: Brzina</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Upozorenje: Brzina</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Upozorenje: PO2 Zeleno</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Upozorenje: Prebrzi izron / PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarm: Prebrzi izron / PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Podaci od pritisku u boci</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>RTG Upozorenje</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>RGT Alarm</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Preporučena izmjena boce</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Premašeno ograničenje dubine</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Upozorenje: Max. vrijeme dekompresije</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Info: Trajanje urona</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alarm: Trajanje urona</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Oznaka</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Nema podatka o boci</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Upozorenje: Baterija pri izmaku</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarm: Baterija pri izmaku</translation>
     </message>
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
new file mode 100644
index 000000000..b9f70495a
--- /dev/null
+++ b/translations/subsurface_hu.ts
@@ -0,0 +1,3801 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.0">
+<context>
+    <name>CylindersModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>WorkPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>StartPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>EndPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>He%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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="341"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="342"/>
+        <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="488"/>
+        <source>psi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="489"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="512"/>
+        <source>l</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="513"/>
+        <source>cuft</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveComputerManagementDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
+        <source>Edit Dive Computer Nicknames</source>
+        <translation>Búvárkomputer becenevének szerkesztése</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="45"/>
+        <source>Remove the selected Dive Computer?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
+        <source>Are you sure that you want to 
+ remove the selected dive computer?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveComputerModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Model</source>
+        <translation>Típús</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Nickname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>kezdés</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveItem</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
+        <source> l/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source> cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveListView</name>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
+        <source>Show Search Box</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <source>expand all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <source>collapse all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <source>collapse others</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <source>remove dive(s) from trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
+        <source>add dive(s) to trip immediately above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <source>merge trip with trip above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
+        <source>merge trip with trip below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
+        <source>delete dive(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <source>mark dive(s) invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <source>save As</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <source>export As UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
+        <source>shift times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
+        <source>upload dive(s) to divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
+        <source>Save Dives As...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
+        <source>Save File as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
+        <source>merge selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Mélység</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Idő</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <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"/>
+    </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="125"/>
+        <source>Last Stop at 6m</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"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
+        <source>10m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
+        <source>30ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
+        <source>Handler Position Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
+        <source>One or more of your stops will be lost with this operations, 
+Please, remove them first.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerPointsModel</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
+        <source>AIR</source>
+        <translation>LÉG</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
+        <source>Final Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
+        <source>Used Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
+        <source>CC Set Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
+        <source>Discard the Plan?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
+        <source>You are about to discard your plan.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
+        <source>Dive Planner Points</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Mélység</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Idő</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>OTU</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>maxCNS</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
+        <source>Invalid response from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
+        <source>no dives were selected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
+        <source>failed to create zip file for upload: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
+        <source>cannot create temporary file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
+        <source>internal error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
+        <source>internal error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
+        <source>Done</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <source>Corrupted download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <source>Upload failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
+        <source>Upload successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
+        <source>Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
+        <source>Cannot parse response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
+        <source>Error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDCWidget</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
+        <source>Error</source>
+        <translation>Hiba</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <source>Retry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
+        <source>Choose file for divecomputer download logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
+        <source>Log files (*.log)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
+        <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="346"/>
+        <source>Choose file for divecomputer binary dump file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <source>Dump files (*.bin)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDiveComputer</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <source>Download From Dive Computer</source>
+        <translation>Letöltés a Búvárkomputerből</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <source>Vendor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <source>Dive Computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <source>Device or Mount Point</source>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <source>Force download of all dives</source>
+        <translation>Minden merülés kényszer letöltése</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <source>Always prefer downloaded dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
+        <source>Edit Selected Dive Locations</source>
+        <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="444"/>
+        <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="468"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <source>Coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <source>Divemaster</source>
+        <translation>Merülés vezető</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <source>Buddy</source>
+        <translation>Társ</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="235"/>
+        <source>Air temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
+        <source>Water temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <source>Rating</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <source>Visibility</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <source>Equipment</source>
+        <translation>Felszerelés</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <source>Dive Info</source>
+        <translation>Merülés Infó</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="395"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <source>Interval</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <source>Gases Used</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <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"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <source>Max. Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <source>Ave. Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <source>OTU</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <source>Air Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <source>Air Temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <source>Water Temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <source>Dive Time</source>
+        <translation>Merülés Idő</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <source>Salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <source>Stats</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <source>Depth</source>
+        <translation>Mélység</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <source>Temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <source>Total Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <source>Dives</source>
+        <translation>Merülések</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <source>Cylinders</source>
+        <translation>Palackok</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <source>Add Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <source>Weights</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
+        <source>Add Weight System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
+        <source>Trip Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <source>Trip Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <source>Save</source>
+        <translation>Ment</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
+        <source>This dive is being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
+        <source>unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>W</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <source>Filter</source>
+        <translation>Szűrő</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
+        <source>New</source>
+        <translation>Új</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
+        <source>Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
+        <source>Save</source>
+        <translation>Ment</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
+        <source>Save as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
+        <source>Close</source>
+        <translation>Bezárás</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
+        <source>Ctrl+I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
+        <source>Export &amp;UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
+        <source>&amp;Edit Device Names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <source>&amp;Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <source>Info</source>
+        <translation>Infó</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
+        <source>All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
+        <source>User &amp;Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
+        <source>Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
+        <source>P&amp;lan Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <source>Auto Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
+        <source>Ctrl+1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <source>Prev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
+        <source>Left</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <source>Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
+        <source>Right</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <source>Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
+        <source>Input Plan</source>
+        <translation>Terv Megadás</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
+        <source>About Subsurface</source>
+        <translation>A Subsurface-ről</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
+        <source>F1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
+        <source>Ctrl+5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <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="276"/>
+        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <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="564"/>
+        <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="566"/>
+        <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="571"/>
+        <source>Save Changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
+        <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="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
+        <source>Save File as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <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="248"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <source>Defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <source>Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <source>Lists and Tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <source>Font</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <source>Font size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <source>Dives</source>
+        <translation>Merülések</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="176"/>
+        <source>Default Dive file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <source>Display Invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="220"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <source>Metric</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <source>Personalize</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <source>Depth</source>
+        <translation>Mélység</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
+        <source>meter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <source>feet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <source>psi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <source>kg</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Filter</source>
+        <translation>Szűrő</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <source>Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <source>Volume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <source>Temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
+        <source>Time units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
+        <source>Ascent/Descent speed denominator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
+        <source>Minutes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
+        <source>Seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
+        <source>Misc</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
+        <source>GFLow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
+        <source>GFHigh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
+        <source>Restart required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
+        <source>To correctly load a new language you must restart Subsurface.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Open Default Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
+        <source>Print</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PrintLayout</name>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <source>Dive#</source>
+        <translation>Merülés#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <source>Depth</source>
+        <translation>Mélység</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <source>Master</source>
+        <translation>Vezető</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+</context>
+<context>
+    <name>PrintOptions</name>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
+        <source>Print options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
+        <source>Print only selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
+        <source>Print in color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
+        <source>Print type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
+        <source>6 dives per page</source>
+        <translation>6 merülés laponként</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
+        <source>2 dives per page</source>
+        <translation>2 merülés oldalanként</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
+        <source>Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
+        <source>Ordering</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
+        <source>Profile on top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
+        <source>Notes on top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
+        <source>Sizing heights (% of layout)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
+        <source>Profile height (43% - 85%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
+        <source>Other data height (8% - 17%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
+        <source>Notes height (0% - 52%)</source>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>ProfilePrintModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
+        <source>unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
+        <source>Dive #%1 - %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
+        <source>Max depth: %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
+        <source>Duration: %1 min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <source>Gas Used:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
+        <source>SAC:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
+        <source>Max. CNS:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
+        <source>Weights:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
+        <source>Notes:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
+        <source>Divemaster:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <source>Buddy:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <source>Suit:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <source>Viz:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <source>Rating:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
+        <source>AIR</source>
+        <translation>LÉG</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <source>Close</source>
+        <translation>Bezárás</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Átlag</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RenumberDialog</name>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="14"/>
+        <source>Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="31"/>
+        <source>New starting number</source>
+        <translation>Új kezdő szám</translation>
+    </message>
+</context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShiftTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="37"/>
+        <source>Shift times of selected dives by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="73"/>
+        <source>h:mm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="83"/>
+        <source>earlier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>later</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceAbout</name>
+    <message>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation>A Subsurface-ről</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="80"/>
+        <source>&amp;License</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="87"/>
+        <source>&amp;Website</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <source>Webservice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
+        <source>Connecting...</source>
+        <translation>Csatlakozás...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
+        <source>Connection Error: </source>
+        <translation>Csatlakozási Hiba:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <source>Invalid user identifier!</source>
+        <translation>Érvénytelen felhasználó azonosító</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Cannot parse response!</source>
+        <translation>Nem lehet feldolgozni választ!</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
+        <source>Download Success!</source>
+        <translation>A Letöltés Sikeres!</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <location filename="../qt-ui/tableview.cpp" line="23"/>
+        <source>Add Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TankInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>ml</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ToolTipItem</name>
+    <message>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WSInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>kg</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Webservice Connection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="25"/>
+        <source>Status:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="32"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
+        <source>User ID</source>
+        <translation>Felhasználói Azonosító</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
+        <source>Upload</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WeightModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="416"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="441"/>
+        <source>kg</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="442"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="465"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="466"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>YearlyStatisticsModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <source>Year 
+ &gt; Month / Trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
+        <source>Duration 
+ Total</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
+        <source>
+Average</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
+        <source>
+Shortest</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
+        <source>
+Longest</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
+        <source>Depth (%1)
+ Average</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
+        <source>
+Minimum</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
+        <source>
+Maximum</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
+        <source>SAC (%1)
+ Average</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
+        <source>Temp. (%1)
+ Average</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>gettextFromC</name>
+    <message>
+        <location filename="../dive.c" line="57"/>
+        <source>pascal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="62"/>
+        <location filename="../qt-gui.cpp" line="348"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="66"/>
+        <location filename="../qt-gui.cpp" line="351"/>
+        <source>psi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="103"/>
+        <location filename="../qt-gui.cpp" line="327"/>
+        <source>l</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="108"/>
+        <location filename="../qt-gui.cpp" line="332"/>
+        <source>cuft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="137"/>
+        <location filename="../qt-gui.cpp" line="232"/>
+        <location filename="../qt-gui.cpp" line="247"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="142"/>
+        <location filename="../qt-gui.cpp" line="235"/>
+        <location filename="../qt-gui.cpp" line="249"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="258"/>
+        <location filename="../qt-gui.cpp" line="268"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="191"/>
+        <location filename="../qt-gui.cpp" line="256"/>
+        <location filename="../qt-gui.cpp" line="266"/>
+        <source>kg</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="1104"/>
+        <source>(%s) or (%s)</source>
+        <translation>(%s) vagy (%s)</translation>
+    </message>
+    <message>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
+        <source>air</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="170"/>
+        <source>integrated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="171"/>
+        <source>belt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="172"/>
+        <source>ankle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="173"/>
+        <source>backplate weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="174"/>
+        <source>clip-on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
+        <source>Failed to read &apos;%s&apos;</source>
+        <translation>&apos;%s&apos; olvasása meghiúsult.</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
+        <source>Maximum number of supported columns on CSV import is %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>none</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>deco stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>rbt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>workload</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>transmitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>violation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>safety stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>gaschange</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (voluntary)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (mandatory)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>deepstop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>ceiling (safety stop)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>divetime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <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="143"/>
+        <source>maxdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>OLF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>airtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>rgbm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>heading</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>tissue level warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>non stop time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="161"/>
+        <source>invalid event number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="403"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="409"/>
+        <source>Error registering the data</source>
+        <translation>Hiba az adat regisztrálása alatt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="417"/>
+        <source>Error parsing the datetime</source>
+        <translation>Hiba a dátumidő feldolgozása alatt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="433"/>
+        <source>Dive %d: %s %d %04d</source>
+        <translation>Merülés %d: %s %d %04d</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="438"/>
+        <source>Error parsing the divetime</source>
+        <translation>Hiba a merülési idő feldolgozása alatt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="447"/>
+        <source>Error parsing the maxdepth</source>
+        <translation>Hiba a max mélység feldolgozása alatt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="456"/>
+        <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="468"/>
+        <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="476"/>
+        <source>Error obtaining surface pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="484"/>
+        <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="491"/>
+        <source>Error parsing the samples</source>
+        <translation>Hiba a minták feldolgozása alatt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="621"/>
+        <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="629"/>
+        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="689"/>
+        <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="694"/>
+        <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="715"/>
+        <source>Dive data import error</source>
+        <translation>Merülési adat importálási hiba</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="754"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="761"/>
+        <source>Unable to open %s %s (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="484"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1625"/>
+        <source>Failed to parse '%s'.
+</source>
+        <translation>&apos;%s&apos; értelmezése meghiúsult.
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1626"/>
+        <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="1845"/>
+        <source>Database query get_events failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
+        <source>Database connection failed '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
+        <source>Database query failed '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <source>Can&apos;t open stylesheet %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="132"/>
+        <source>Can&apos;t find gas %d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="324"/>
+        <source>Too many gas mixes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="504"/>
+        <source>%s
+Subsurface dive plan
+based on GFlow = %.0f and GFhigh = %.0f
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="545"/>
+        <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="554"/>
+        <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="565"/>
+        <source>Switch gas to %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="573"/>
+        <source>Gas consumption:
+</source>
+        <translation>Gáz felhasználás:
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="584"/>
+        <source>%.0f%s of %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="783"/>
+        <source>ean</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1234"/>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1238"/>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1247"/>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
+        <source>%sT: %d:%02d min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
+        <source>%s %sD:%.1f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1430"/>
+        <source>%s %sD:%.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1434"/>
+        <source>%s%sV:%.2f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
+        <source>%s %sV:%.2f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1449"/>
+        <source>%s %sP:%d %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="308"/>
+        <source>C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="311"/>
+        <source>F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="498"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="511"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="524"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="529"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>boat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>shore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>drift</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>deep</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>cavern</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>ice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>wreck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>cave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>pool</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>lake</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>river</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>night</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
+        <source>deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="216"/>
+        <source>more than %d days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="222"/>
+        <source>%dd %dh %dmin</source>
+        <translation>%dn %dó %dp</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dh %dmin</source>
+        <translation>%dó %dp</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="235"/>
+        <source>for dives #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="242"/>
+        <source>for selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="277"/>
+        <source>for dive #%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="279"/>
+        <source>for selected dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="281"/>
+        <source>for all dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="283"/>
+        <source>(no dives)</source>
+        <translation>(nincs merülés)</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sun</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Mon</source>
+        <translation>H</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Tue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Wed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Thu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Fri</source>
+        <translation>P</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jan</source>
+        <translation>Jan</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Feb</source>
+        <translation>Feb</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Mar</source>
+        <translation>Már</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Apr</source>
+        <translation>Ápr</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>May</source>
+        <translation>Máj</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jun</source>
+        <translation>Jún</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Jul</source>
+        <translation>Júl</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Aug</source>
+        <translation>Aug</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Sep</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Oct</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Nov</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Dec</source>
+        <translation>Dec</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="24"/>
+        <source>Uemis Zurich: File System is almost full
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="107"/>
+        <source>unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="379"/>
+        <source>Reading %s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="399"/>
+        <source>data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>divelog entry id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="422"/>
+        <source>divespot data id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="424"/>
+        <source>more data dive id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>wetsuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>semidry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>drysuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>vest</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>long john</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>jacket</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>full suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>2 pcs full suit</source>
+        <translation>2 db teljes öltözet</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="620"/>
+        <source>membrane</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="802"/>
+        <source>Init Communication</source>
+        <translation>Kommunikáció kezdése</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="804"/>
+        <source>Uemis init failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="815"/>
+        <source>Start download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="196"/>
+        <source>Safety Stop Violation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="198"/>
+        <source>Speed Alarm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="201"/>
+        <source>Speed Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="203"/>
+        <source>PO2 Green Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="206"/>
+        <source>PO2 Ascend Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="208"/>
+        <source>PO2 Ascend Alarm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="212"/>
+        <source>Tank Pressure Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="214"/>
+        <source>RGT Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="216"/>
+        <source>RGT Alert</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="218"/>
+        <source>Tank Change Suggested</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="220"/>
+        <source>Depth Limit Exceeded</source>
+        <translation>Mélység Limit Túllépve</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="222"/>
+        <source>Max Deco Time Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="224"/>
+        <source>Dive Time Info</source>
+        <translation>Merülés Idő Infó</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="226"/>
+        <source>Dive Time Alert</source>
+        <translation>Merülés Idő Riasztás</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="228"/>
+        <source>Marker</source>
+        <translation>Jelölő</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="230"/>
+        <source>No Tank Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="232"/>
+        <source>Low Battery Warning</source>
+        <translation>Merülő Elem Figyelmeztetés</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="234"/>
+        <source>Low Battery Alert</source>
+        <translation>Merülő Elem Riasztás</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index 524b9c505..29004fa37 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Kedalaman</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Ukuran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>WorkPress</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>StartPress</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>EndPress</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -172,35 +94,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>ID Perangkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Nama Panggilan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>udara</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Bailing out untuk OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>Mulai</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>udara</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>I/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -208,101 +173,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Munculkan Kotak Pencari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>Tampilkan semua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>Sembunyikan semua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Simpan Berkas sebagai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>Gabungkan selam berikut</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>edalaman</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Satuan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Tanggal</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Rekan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Berat</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -344,22 +468,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Kesalahan posisi Handler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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>
@@ -368,37 +492,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>UDARA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Kedalaman akhir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gas terpaikai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>Titik CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Abaikan Rencana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Kamu hendak mengabaikan Rencana</translation>
     </message>
@@ -406,85 +530,158 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Titik-titik Rencana Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Tekanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>menit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>menit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -492,114 +689,114 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -607,48 +804,54 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Kesalahan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -716,7 +919,7 @@ Please, remove them first.</source>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation type="unfinished"/>
     </message>
@@ -725,13 +928,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
@@ -757,11 +960,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation type="unfinished"/>
     </message>
@@ -787,7 +992,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
@@ -898,92 +1103,102 @@ Please, remove them first.</source>
         <translation>Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Tabung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Tambah Tabung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Tambah Sistem Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Lokasi Perjalanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Catatan Perjalanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Simpan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>T</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>B</translation>
     </message>
@@ -991,428 +1206,518 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Saring</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Baru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Buka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Simpan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Simpan sebagai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Impor Berkas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
-        <source>Ctrl+U</source>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
-        <source>Ctrl+,</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Print</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Preferensi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Tambah Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Grup Otomatis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Cltrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>DC Sebelumnya</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Kiri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>DC Selanjunya</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Kanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Pilih Aktifitas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Masukkan Rencana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Tentang Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Buka Berkas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Panduan Subsurface tak dapat ditemukan</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Simpan perubahan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Simpan Berkas sebagai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1482,209 +1787,187 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalisasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Saring</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Tekanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Satuan Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>penyebut kecepatan naik/turun</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Detik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Tampilkan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>Ambang Batas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Batas yang dilaporkan perangkat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>batas merah sejajar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>batas terhitung</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>Tampilkan semua jaringan</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>Kenaikan 3m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Lain-lain</translation>
     </message>
@@ -1694,37 +1977,32 @@ Please, remove them first.</source>
         <translation>Preferensi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Buka Berkas Log Acuan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1732,22 +2010,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1870,216 +2148,116 @@ Please, remove them first.</source>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>perangkat tidak dikenal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Set Durasi: 10 Menit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Skala</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Penggaris</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>udara</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Bailing out untuk OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>Mulai</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>Akhir</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Selam #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Kedalaman Maks: 1% 2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Durasi: %1 menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <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="36"/>
         <source>AIR</source>
         <translation>UDARA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation type="unfinished"/>
     </message>
@@ -2089,22 +2267,22 @@ Please, remove them first.</source>
         <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Minimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -2122,6 +2300,59 @@ Please, remove them first.</source>
         <translation>Nomor Awal baru</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2158,20 +2389,25 @@ Please, remove them first.</source>
         <translation>Tentang Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Lisensi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Website</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2181,37 +2417,37 @@ Please, remove them first.</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Kesalahan Koneksi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>identifikasi pengguna tidak cocok!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Respon gagal di telaah!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Unduh Sukses!</translation>
     </message>
@@ -2227,17 +2463,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2245,20 +2481,33 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informasi</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Panduan Subsurface tak dapat ditemukan</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
@@ -2281,32 +2530,32 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation type="unfinished"/>
     </message>
@@ -2314,115 +2563,115 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Total Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Terpendek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Terjauh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dalam (%1)
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2438,25 +2687,25 @@ Rata-rata</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>I</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2489,17 +2738,17 @@ Rata-rata</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>udara</translation>
     </message>
@@ -2531,20 +2780,16 @@ Rata-rata</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Gagal baca &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -2686,17 +2931,17 @@ Rata-rata</translation>
         <translation>nomor kejadian tidak sesuai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Gagal mendaftarkan data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Gagal mengurai tanggal</translation>
     </message>
@@ -2711,128 +2956,153 @@ Rata-rata</translation>
         <translation>Gagal mengurai waktu selam</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gagal mengurai perhitungan campuran gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2841,242 +3111,255 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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="551"/>
+        <location filename="../planner.c" line="554"/>
         <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="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
+        <source>P: %d%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
+        <source>T: %.1f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
+        <source>SAC: %2.1fl/min
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
@@ -3176,142 +3459,142 @@ TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation type="unfinished"/>
     </message>
@@ -3336,187 +3619,187 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 36e9877f3..134292a37 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importa file (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Separatore di campo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Configurazione Campo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>importa file CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Ora</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Profondità</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Importazioni preconfigurate</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Apri File di Log CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
-        <translation type="unfinished"/>
+        <translation>Pressione di lavoro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
-        <translation type="unfinished"/>
+        <translation>Pressione iniziale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
-        <translation type="unfinished"/>
+        <translation>Pressione finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <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="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>La bombola non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>piedi cubi</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ il computer seleizonato?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>ID della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Nickname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Facendo click qui si rimuove questo computer.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>aria</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN1%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Bailing out in circuito aperto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>inizio</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>aria</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN1%</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>piedi cubi/min</translation>
     </message>
@@ -209,101 +174,260 @@ il computer seleizonato?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Mostra la finestra di ricerca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>espandi tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>collassa tutte le voci</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
-        <translation type="unfinished"/>
+        <translation>Nascondi le altre immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <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="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>crea un nuovo viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <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="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>cancella immersione(i)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>segnala immersione(i) non valide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Esporta come UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
-        <translation type="unfinished"/>
+        <translation>Cambia l&apos;orario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation>Carica immagini</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Carica le immersioni a divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Salva immersioni come ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>File UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation>Apri file immagine</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <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="730"/>
         <source>merge selected dives</source>
         <translation>unisci le immersioni selezionate</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Separatore di campo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Configurazione Campo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Profondità</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Profondità della sosta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Ora</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Unità</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrico</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperiale</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation>Immersioni manuali</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation>Immersione #</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Luogo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation>Profondità massima</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation>Profondità media</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Compagno</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Note</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -339,28 +463,28 @@ il computer seleizonato?</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Pressione Atmosferica</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30 piedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Gestore dell&apos;errore di posizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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,
@@ -370,37 +494,37 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>ARIA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gas usato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Elimino il piano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Stai cancellando il piano</translation>
     </message>
@@ -408,85 +532,158 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Punti del Dive Planner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Miscele disponibili</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"/>
+        <translation>aggiungi una sosta all&apos;immersione</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Profondità</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Ora</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Pressione</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation>Colore</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation>Inserito dall&apos;utente</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation>Indice della bombola</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation>Pressione S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation>Pressione I</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation>Ceiling</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation>pN2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
     </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
         <source>suit</source>
         <translation>muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
         <source>cyl</source>
-        <translation type="unfinished"/>
+        <translation>bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
         <source>location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>max CNS</translation>
     </message>
@@ -494,165 +691,172 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
-        <translation type="unfinished"/>
+        <translation>Risposta non valida dal server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation type="unfinished"/>
+        <translation>Tag XML atteso &apos;DiveDateReader&apos;, trovato invece &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation type="unfinished"/>
+        <translation>Tag XML atteso &apos;DiveDateReader&apos; non trovato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Risposta XML malformata. Linea %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
-        <translation type="unfinished"/>
+        <translation>nessuna immersione è selezionata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
-        <translation type="unfinished"/>
+        <translation>Errore nella creazione del file zip per l&apos;upload: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
-        <translation type="unfinished"/>
+        <translation>errore nella creazione del file temporaneo: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
-        <translation type="unfinished"/>
+        <translation>errore interno: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
-        <translation type="unfinished"/>
+        <translation>errore interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Fatto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Sto caricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Sto scaricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
-        <source>Download finished - %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
-        <source>Corrupted download</source>
-        <translation type="unfinished"/>
+        <translation>Sto scaricando %1 immersioni...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <source>Download finished - %1</source>
+        <translation>Scaricamento finito - %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <source>Corrupted download</source>
+        <translation>Scaricamento corrotto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
-        <source>Upload failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
-        <source>Upload successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
-        <source>Login failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
-        <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;archivio non può essere aperto:
+%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
-        <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <source>Upload failed</source>
+        <translation>Caricamento fallito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
+        <source>Upload successful</source>
+        <translation>Caricamento eseguito</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
+        <source>Login failed</source>
+        <translation>Accesso fallito</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
+        <source>Cannot parse response</source>
+        <translation>Non riesco ad analizzare la risposta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
+        <source>Error: %1</source>
+        <translation>Errore: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
-        <translation type="unfinished"/>
+        <translation>Caricamento finito</translation>
     </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Riprova</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Cerca computer Uemis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
-        <translation type="unfinished"/>
+        <translation>Scegli il file per scaricare il log dal computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
-        <translation type="unfinished"/>
+        <translation>Files di Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
-        <translation type="unfinished"/>
+        <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
-        <translation type="unfinished"/>
+        <translation>Scegli il file di dump per il computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
-        <translation type="unfinished"/>
+        <translation>File di dump (*.bin)</translation>
     </message>
 </context>
 <context>
@@ -675,7 +879,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"/>
+        <translation>Periferica o punto di mount</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
@@ -707,18 +911,18 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
         <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
+        <translation>Salva il file di log di libdivecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"/>
+        <translation>Salva il file di dump di libdivecomputer</translation>
     </message>
 </context>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Modifica le località d&apos;immersione selezionate</translation>
     </message>
@@ -727,13 +931,13 @@ Per favore, rimuovile prima.</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
@@ -759,11 +963,13 @@ Per favore, rimuovile prima.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Temperatura dell&apos;acqua</translation>
     </message>
@@ -789,7 +995,7 @@ Per favore, rimuovile prima.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
@@ -900,92 +1106,102 @@ Per favore, rimuovile prima.</translation>
         <translation>Immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Bombole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Aggiungi bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Pesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Aggiungi un tipo di pesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Luogo del viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Note di viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Questo viaggio è stato editato.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Si stanno modificando immersioni multiple.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Si sta modificando questa immersione </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -993,428 +1209,518 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nuovo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Apri logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl-O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importa files</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Esporta &amp;UUDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation>Abilità EAD, END e EADD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl-U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Stampa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importa &amp;dal computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Modifica il nome della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Rinumera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Lista immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Informazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manuale Utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Pianifica immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importa CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importa CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importa da Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation>Abilita MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <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"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation>Mostra il ceiling calcolato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <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"/>
+        <source>Calculate All Tissues</source>
+        <translation>Calcola tutti i tessuti</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation>Mostra il consumo equivalente di superficie (SAC)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation>Abilita / Disabilita righello</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Aggiungi immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Raggruppamento Automatico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>DC precedente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>DC successivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Seleziona eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Piano in ingresso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Informazioni su Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation>Importa logbook da file</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <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="878"/>
+        <source>&amp;Full Screen</source>
+        <translation>&amp;Tutto Schermo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation>Abilita Modalità Tutto Schermo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Apri File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
-        <translation type="unfinished"/>
+        <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation type="unfinished"/>
+        <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
-        <translation type="unfinished"/>
+        <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="503"/>
-        <source>User Manual</source>
-        <translation>Manuale Utente</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Manuale di Subsurface non trovato</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Salvare le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation type="unfinished"/>
+        <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>File UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Statistiche Annuali</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation>Apri file di log immersioni</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <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>PreferencesDialog</name>
@@ -1436,7 +1742,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="115"/>
         <source>Language</source>
-        <translation type="unfinished"/>
+        <translation>Lingua</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="141"/>
@@ -1484,209 +1790,187 @@ Per favore, rimuovile prima.</translation>
         <translation>Usa questa bombola come default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalizza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
-        <translation type="unfinished"/>
+        <translation>metri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
-        <translation type="unfinished"/>
+        <translation>piedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
-        <translation type="unfinished"/>
+        <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
-        <translation type="unfinished"/>
+        <translation>piedi cubici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
-        <translation type="unfinished"/>
+        <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
-        <translation type="unfinished"/>
+        <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation>soglia quando è visibile la pO₂</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation>soglia quando è visibile la pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation>soglia quando è visibile la pHe</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation>max ppO₂ quando è visibile la MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <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="655"/>
+        <source>unused tanks</source>
+        <translation>Bombole inutilizzate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
-        <translation type="unfinished"/>
+        <translation>Usa Lingua di sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Pressione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Unità di Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Denominatore della Risalita/Discesa </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Secondi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>soglia</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Ceiling riportato dal computer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Ceiling calcolato</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>mostra tutti i tessuti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>incrementi di 3m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Calcola NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow alla massima profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
@@ -1696,37 +1980,32 @@ Per favore, rimuovile prima.</translation>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
-        <translation type="unfinished"/>
+        <translation>Richiesto riavvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation type="unfinished"/>
+        <translation>Per caricare correttamente la nuova lingua è richiesto il riavvio di Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Apri il log di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1734,22 +2013,22 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Anteprima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Stampa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Stampa</translation>
     </message>
@@ -1847,22 +2126,22 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"/>
+        <translation>Dimensione altezza (% del layout)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"/>
+        <translation>Altezza della sezione Profilo (43% - 85%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"/>
+        <translation>Altezza della sezione Altri Dati (8% - 17%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"/>
+        <translation>Altezza della sezione Note (0% - 52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="354"/>
@@ -1872,216 +2151,116 @@ Per favore, rimuovile prima.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Aggiungi una miscela</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Aggiungi un segnalibro</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Rimuovi evento</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Nascondi eventi simili</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Nascondi eventi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Nascondo tutti i %1 eventi?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Rimuovo l&apos;evento selezionato?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>Computer sconosciuto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Setta la durata: 10 minuti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Scala</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Righello</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Riscala l&apos;immersione per l&apos;ampiezza dello schermo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Modifica</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>aria</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN1%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Bailing out in circuito aperto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>inizio</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>fine</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Immersione #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Massima profondità: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Miscela usata:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Pesi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Muta:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
-        <translation type="unfinished"/>
+        <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Valutazione:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Aggiungi una miscela</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Aggiungi un segnalibro</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Rimuovi evento</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Nascondi eventi simili</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Mostra tutti gli eventi</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>ARIA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Rimuovi questo punto</translation>
     </message>
@@ -2091,24 +2270,24 @@ Per favore, rimuovile prima.</translation>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <translation>Spostare la mappa e fare doppio-click per definire la posizione dell&apos;immersione</translation>
     </message>
 </context>
 <context>
@@ -2124,17 +2303,70 @@ Per favore, rimuovile prima.</translation>
         <translation>Nuovo numero di inizio</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Cambia l&apos;orari selezionati</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation>Sposta l&apos;orario delle immagini di</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>prima</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>dopo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <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="155"/>
+        <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="193"/>
+        <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="181"/>
+        <source>Open Image File</source>
+        <translation>Apri file immagine</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Formato file immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="20"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"/>
+        <translation>Cambia l&apos;orari selezionati</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="37"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"/>
+        <translation>Cambia l&apos;orario delle immersioni selezionate di</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="73"/>
@@ -2160,20 +2392,25 @@ Per favore, rimuovile prima.</translation>
         <translation>Informazioni su Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Software multipiattaforma per gestione immersioni&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Licenza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>Sito web</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Chiudi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Libretto delle immersioni multipiattaforma&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;</translation>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2183,37 +2420,37 @@ Per favore, rimuovile prima.</translation>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>In connessione...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation>Download finito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Errore scaricamento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Errore di connessione:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Identificatore dell&apos;utente non valido!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Non posso analizzare la risposta!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Download effettuato!</translation>
     </message>
@@ -2229,17 +2466,17 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2247,20 +2484,33 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Manuale Utente</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Manuale di Subsurface non trovato</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2270,7 +2520,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Connessione al webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
@@ -2283,150 +2533,150 @@ Per favore, rimuovile prima.</translation>
         <translation>Inserisci il tuo ID qui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>ID utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Invia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;operazione è durata troppo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
-        <translation type="unfinished"/>
+        <translation>Trasferimento dati...</translation>
     </message>
 </context>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Anno 
 &gt; Mese / Viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Durata 
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Più lunga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profondità (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2442,25 +2692,25 @@ Media</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
@@ -2493,17 +2743,17 @@ Media</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
@@ -2535,20 +2785,16 @@ Media</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Impossibile leggere &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Errore di lettura &apos;%s&apos;.  Usa importa per i file CSV.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation>
     </message>
@@ -2690,17 +2936,17 @@ Media</translation>
         <translation>numero evento non valido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Errore registrando la data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Errore analizzando la data/il tempo</translation>
     </message>
@@ -2715,72 +2961,72 @@ Media</translation>
         <translation>Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <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="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Lettura di strane percentuali %s
@@ -2788,61 +3034,91 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Impossibile analizzare &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossibile analizzare  &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Interrogazione get_events fallita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation>La query get_tags sul database non è riuscita.
+</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Connessione al database fallita &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Interrogazione al database fallita &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
-        <source>Can&apos;t open stylesheet %s</source>
-        <translation type="unfinished"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation>La query get_cylinders sul database non è riuscita.
+</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../parse-xml.c" line="2004"/>
+        <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="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation>La query get_profile_sample sul database non è riuscita.
+
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <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="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Non trovo il gas %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Troppe miscele gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,256 +3131,289 @@ basato su GFlow = %.0f e GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Cambiare gas a %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Consumo gas:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s di %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s⏎ T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Calcolo ceiling %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s⏎ Sosta di sicurezza:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s⏎ Sosta di sicurezza:tempo sconosciuto @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s⏎ Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s⏎ Deco:tempo sconosciuto @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s⏎ In decompressione</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s⏎ NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s⏎ CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation>@:%d:%02d
+D:%.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s⏎ pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation>P:%d%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s⏎ pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation>T: %.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s⏎ pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation>V: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s⏎ MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation>SAC: %2.1fl/min
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation>CNS: %u%%
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"/>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation>pO₂%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-In decompressione (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation>pN₂ %s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation>pHe: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation>MOD: %d%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation>Sosta di sicurezza: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation>Sosta di sicurezza: </translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation>Deco: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation>Deco: temo di sosta sconosciuto @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation>In deco
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation>NDL: %umin
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation>Deco: %umin @ %.0f%s (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation>In deco (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation>NDL:%umin (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation>TTS: %umin (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation>Ceiling calcolato %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation>Tessuto %.0fmin: %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation>Battito cardiaco: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation>Direzione: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"/>
+        <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>%s %sD:%.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 immersioni)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 immersione)</translation>
     </message>
@@ -3204,142 +3513,142 @@ TTS:%umin (calc)</translation>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>più di %d giorni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dt %dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>per l&apos;immersione #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>per le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>per l&apos;immersione #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>per l&apos;immersione selezionata</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>per tutte le immersioni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(nessuna immersione)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Gen</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -3369,187 +3678,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Lo Uemis Zurich e&apos; collegato correttamente?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Sto leggendo %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>id del log d&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>data id di divespot</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>più id di dati d&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>muta umida</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semi stagna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>Muta stagna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>maglia</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>GAV</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>muta intera</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>Muta intera 2 pezzi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Inizializzo la comunicazione</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Impossibile inizializzare l&apos;Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Inizio download</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Violazione della tappa di sicurezza</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Allarme Risalita Veloce</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Avviso Risalita Veloce</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Avviso PO2 Verde</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Avviso Incremento PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Allarme Incremento PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Informazione Pressione della bombola</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Avviso RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Allarme RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Suggerito Cambio Bombola</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Limite Profondità Superato</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Avviso: Massimo tempo di decompressione</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Info: Tempo d&apos;Immersione</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Allarme: Tempo d&apos;Immersione</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Marcatore</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Nessun dato sulla bombola</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Avviso: Batteria Scarica</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Allarme: Batteria scarica</translation>
     </message>
diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts
new file mode 100644
index 000000000..bc88a8128
--- /dev/null
+++ b/translations/subsurface_lv_LV.ts
@@ -0,0 +1,3809 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="lv_LV" version="2.0">
+<context>
+    <name>CylindersModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Type</source>
+        <translation>Tips</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Size</source>
+        <translation>Izmērs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>WorkPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>StartPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>EndPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>He%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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="341"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="342"/>
+        <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="488"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="489"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="512"/>
+        <source>l</source>
+        <translation>Es</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="513"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
+    </message>
+</context>
+<context>
+    <name>DiveComputerManagementDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
+        <source>Edit Dive Computer Nicknames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="45"/>
+        <source>Remove the selected Dive Computer?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
+        <source>Are you sure that you want to 
+ remove the selected dive computer?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveComputerModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Model</source>
+        <translation>Modelis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Device ID</source>
+        <translation>Ierīces ID</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Nickname</source>
+        <translation>Lietotājvārds</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>gaisa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>Kļūda: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>gaisa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
+<context>
+    <name>DiveItem</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
+        <source> l/min</source>
+        <translation>l/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source> cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveListView</name>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
+        <source>Show Search Box</source>
+        <translation>Parādīt meklēšanas logu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <source>expand all</source>
+        <translation>izvērst visu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <source>collapse all</source>
+        <translation>savērst visu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <source>collapse others</source>
+        <translation>savērst pārējus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <source>remove dive(s) from trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
+        <source>add dive(s) to trip immediately above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <source>merge trip with trip above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
+        <source>merge trip with trip below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
+        <source>delete dive(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <source>mark dive(s) invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <source>save As</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <source>export As UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
+        <source>shift times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
+        <source>upload dive(s) to divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
+        <source>Save Dives As...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
+        <source>Save File as</source>
+        <translation>Saglabāt datni kā</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
+        <source>merge selected dives</source>
+        <translation>saplūdināt izvēlētas niršanas</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Laiks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <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"/>
+        <source>Metric</source>
+        <translation>Metrisks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Datums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Draugs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Svars</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlanner</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
+        <source>Bottom SAC</source>
+        <translation type="unfinished"/>
+    </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>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"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
+        <source>10m</source>
+        <translation>10m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
+        <source>30ft</source>
+        <translation>30ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
+        <source>Handler Position Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
+        <source>One or more of your stops will be lost with this operations, 
+Please, remove them first.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerPointsModel</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
+        <source>AIR</source>
+        <translation>Gaisa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
+        <source>Final Depth</source>
+        <translation>Gala dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
+        <source>Used Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
+        <source>CC Set Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
+        <source>Discard the Plan?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
+        <source>You are about to discard your plan.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
+        <source>Dive Planner Points</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Laiks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Spiediens</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatūra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>datums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>kostīms</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>vieta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>maxCNS</source>
+        <translation>maxCNS</translation>
+    </message>
+</context>
+<context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
+        <source>Invalid response from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
+        <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="552"/>
+        <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="559"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
+        <source>no dives were selected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
+        <source>failed to create zip file for upload: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
+        <source>cannot create temporary file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
+        <source>internal error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
+        <source>internal error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
+        <source>Done</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <source>Corrupted download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <source>Upload failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
+        <source>Upload successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
+        <source>Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
+        <source>Cannot parse response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
+        <source>Error: %1</source>
+        <translation>Kļūda: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDCWidget</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>OK</source>
+        <translation>Viss kārtībā</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
+        <source>Error</source>
+        <translation>Kļūda</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <source>Retry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
+        <source>Choose file for divecomputer download logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
+        <source>Log files (*.log)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
+        <source>Warning</source>
+        <translation>Brīdinājums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
+        <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="346"/>
+        <source>Choose file for divecomputer binary dump file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <source>Dump files (*.bin)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDiveComputer</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <source>Download From Dive Computer</source>
+        <translation>Lejupielādēt no niršanas datora</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <source>Vendor</source>
+        <translation>Ražotājs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <source>Dive Computer</source>
+        <translation>Niršanas dators</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <source>Device or Mount Point</source>
+        <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>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <source>Force download of all dives</source>
+        <translation>Piespiest lejupielādēt visas niršanas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <source>Always prefer downloaded dives</source>
+        <translation>Vienmēr lejupielādēt niršanas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <source>OK</source>
+        <translation>Labi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <source>Cancel</source>
+        <translation>Atcelt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Rediģēt izvēlētas niršanas vietas</translation>
+    </message>
+</context>
+<context>
+    <name>MainTab</name>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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="468"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <source>Coordinates</source>
+        <translation>Koordinātas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <source>Divemaster</source>
+        <translation>Niršanas speciālists</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <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="235"/>
+        <source>Air temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
+        <source>Water temp</source>
+        <translation>Ūdens temp.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <source>Visibility</source>
+        <translation>Redzamība</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <source>Suit</source>
+        <translation>Kostīms</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <source>Equipment</source>
+        <translation>Aprīkojums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <source>Dive Info</source>
+        <translation>Niršanas informācija</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="395"/>
+        <source>Date</source>
+        <translation>Datums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <source>Interval</source>
+        <translation>Intervāls</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <source>Gases Used</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <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"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <source>Max. Depth</source>
+        <translation>Maks. dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <source>Ave. Depth</source>
+        <translation>Vid. dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <source>Air Pressure</source>
+        <translation>Gaisa spiediens</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <source>Air Temperature</source>
+        <translation>Gaisa temperatūra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <source>Water Temperature</source>
+        <translation>Ūdens temperatūra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <source>Dive Time</source>
+        <translation>Niršanas laiks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <source>Salinity</source>
+        <translation>Sāļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <source>Stats</source>
+        <translation>Statistika</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <source>Depth</source>
+        <translation>Dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <source>Temperature</source>
+        <translation>Temperatūra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <source>Total Time</source>
+        <translation>Kopējais laiks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <source>Dives</source>
+        <translation>Niršanas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <source>Cylinders</source>
+        <translation>Cilindri</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <source>Add Cylinder</source>
+        <translation>Pievienot cilindri</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <source>Weights</source>
+        <translation>Sver</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
+        <source>Add Weight System</source>
+        <translation>Pievienot svara sistēmu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
+        <source>Trip Location</source>
+        <translation>Ceļojuma vieta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <source>Trip Notes</source>
+        <translation>Ceļojuma piezīmes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <source>Save</source>
+        <translation>Saglabāt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <source>Cancel</source>
+        <translation>Dzēst</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
+        <source>This dive is being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
+        <source>unknown</source>
+        <translation>nezināms</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>N</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>S</source>
+        <translation>D</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>E</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>W</source>
+        <translation>R</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <source>Filter</source>
+        <translation>Filtrs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
+        <source>New</source>
+        <translation>Jauns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
+        <source>Open</source>
+        <translation>Atvērt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
+        <source>Save</source>
+        <translation>Saglabāt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
+        <source>Save as</source>
+        <translation>Saglabāt kā</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
+        <source>Close</source>
+        <translation>Aizvērt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+w</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+l</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
+        <source>Export &amp;UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
+        <source>&amp;Edit Device Names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <source>&amp;Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <source>Profile</source>
+        <translation>Profils</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <source>Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
+        <source>All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
+        <source>User &amp;Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
+        <source>Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
+        <source>P&amp;lan Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation>Ieslēgt / Izslēgt lienālu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
+        <source>Add Dive</source>
+        <translation>Pievienot niršanu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <source>Auto Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <source>Prev DC</source>
+        <translation>Iepr. DC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
+        <source>Left</source>
+        <translation>Pa kreisi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <source>Next DC</source>
+        <translation>Nākamais DC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
+        <source>Right</source>
+        <translation>Pa labi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <source>Select Events</source>
+        <translation>Izvēlēt notikumus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
+        <source>Input Plan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
+        <source>About Subsurface</source>
+        <translation>Par Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
+        <source>Open File</source>
+        <translation>Atvērt failu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <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="276"/>
+        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <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="564"/>
+        <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="566"/>
+        <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="571"/>
+        <source>Save Changes?</source>
+        <translation>Saglabāt izmaiņas?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
+        <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="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
+        <source>Save File as</source>
+        <translation>Saglabāt datni kā</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
+        <source>Warning</source>
+        <translation>Brīdinājums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <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="248"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
+        <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <source>Defaults</source>
+        <translation>Noklusējumi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <source>Units</source>
+        <translation>Mērvienības</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <source>Graph</source>
+        <translation>Grafiks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <source>Lists and Tables</source>
+        <translation>Saraksti un tabulas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <source>Font</source>
+        <translation>Fonts</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <source>Font size</source>
+        <translation>Fonta izmērs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <source>Dives</source>
+        <translation>Niršanas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="176"/>
+        <source>Default Dive file</source>
+        <translation>Noklusējama niršanas datne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <source>Display Invalid</source>
+        <translation>Izrādīt nederīgu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="220"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
+        <source>System</source>
+        <translation>Sistēma</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <source>Metric</source>
+        <translation>Metrisks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <source>Personalize</source>
+        <translation>Personalizēt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <source>Depth</source>
+        <translation>Dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
+        <source>meter</source>
+        <translation>metrs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <source>feet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <source>liter</source>
+        <translation>litrs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Filter</source>
+        <translation>Filtrs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <source>Pressure</source>
+        <translation>Spiediens</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <source>Volume</source>
+        <translation>Tilpums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <source>Temperature</source>
+        <translation>Temperatūra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <source>Weight</source>
+        <translation>Svars</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
+        <source>Time units</source>
+        <translation>Laika mērvienības</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
+        <source>Ascent/Descent speed denominator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
+        <source>Minutes</source>
+        <translation>Minūtes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
+        <source>Seconds</source>
+        <translation>Sekundes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
+        <source>Show</source>
+        <translation>Parādīt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
+        <source>Misc</source>
+        <translation>Dažāds</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
+        <source>Restart required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
+        <source>To correctly load a new language you must restart Subsurface.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Open Default Log File</source>
+        <translation>Atvērt noklusējamo žurnalēšanas datni</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation>
+    </message>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
+        <source>Print</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PrintLayout</name>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <source>Dive#</source>
+        <translation>Niršana#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <source>Date</source>
+        <translation>Datums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <source>Depth</source>
+        <translation>Dziļums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <source>Master</source>
+        <translation>Speciālists</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <source>Buddy</source>
+        <translation>Draugs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
+</context>
+<context>
+    <name>PrintOptions</name>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
+        <source>Print options</source>
+        <translation>Drukas opcijas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
+        <source>Print only selected dives</source>
+        <translation>Drukāt tikai izvēlētas niršanas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
+        <source>Print in color</source>
+        <translation>Drukāt krāsaino</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
+        <source>Print type</source>
+        <translation>Drukāt tipu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
+        <source>6 dives per page</source>
+        <translation>6 niršanas uz lapu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
+        <source>2 dives per page</source>
+        <translation>2 niršanas uz lapu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
+        <source>Table print</source>
+        <translation>Drukāt tabulu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
+        <source>Ordering</source>
+        <translation>Sakārtošana</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
+        <source>Profile on top</source>
+        <translation>Profils no augšas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
+        <source>Notes on top</source>
+        <translation>Piezīmes no augšas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
+        <source>Sizing heights (% of layout)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
+        <source>Profile height (43% - 85%)</source>
+        <translation>Profiļa augstums (43% - 85%)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
+        <source>Other data height (8% - 17%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
+        <source>Notes height (0% - 52%)</source>
+        <translation>Piezīmes augstums (0% - 52%)</translation>
+    </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>0</translation>
+    </message>
+</context>
+<context>
+    <name>ProfilePrintModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
+        <source>unknown</source>
+        <translation>nezināms</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
+        <source>Dive #%1 - %2</source>
+        <translation>Niršana #%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
+        <source>Max depth: %1 %2</source>
+        <translation>Maks. dziļums: %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
+        <source>Duration: %1 min</source>
+        <translation>Ilgums: %1 min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <source>Gas Used:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
+        <source>SAC:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
+        <source>Max. CNS:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
+        <source>Weights:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
+        <source>Notes:</source>
+        <translation>Piezīmes:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
+        <source>Divemaster:</source>
+        <translation>Niršanas speciālists:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <source>Buddy:</source>
+        <translation>Draugs:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <source>Suit:</source>
+        <translation>Kostīms:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <source>Viz:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <source>Rating:</source>
+        <translation>Novērtējums:</translation>
+    </message>
+</context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
+        <source>AIR</source>
+        <translation>Gaisa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <source>Close</source>
+        <translation>Aizvērt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Vidējais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maksimums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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>
+</context>
+<context>
+    <name>RenumberDialog</name>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="14"/>
+        <source>Renumber</source>
+        <translation>Pārnumurēt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="31"/>
+        <source>New starting number</source>
+        <translation>Jauns sākuma skaitlis</translation>
+    </message>
+</context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>agrāk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>vēlāk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShiftTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="37"/>
+        <source>Shift times of selected dives by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="73"/>
+        <source>h:mm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="83"/>
+        <source>earlier</source>
+        <translation>agrāk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>later</source>
+        <translation>vēlāk</translation>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceAbout</name>
+    <message>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation>Par Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="80"/>
+        <source>&amp;License</source>
+        <translation>&amp;Atļauja</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="87"/>
+        <source>&amp;Website</source>
+        <translation>&amp;Tīmekļvietne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <source>Webservice</source>
+        <translation>Tīmekļserviss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
+        <source>Connection Error: </source>
+        <translation>Savienojuma Kļūda:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <source>Invalid user identifier!</source>
+        <translation>Nepareizs lietotāja identifikators!</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Cannot parse response!</source>
+        <translation>Nevar saparsēt atbildi!</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
+        <source>Download Success!</source>
+        <translation>Lejupielādēšana ir sekmīga!</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <location filename="../qt-ui/tableview.cpp" line="23"/>
+        <source>Add Cylinder</source>
+        <translation>Pievienot cilindri</translation>
+    </message>
+</context>
+<context>
+    <name>TankInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>Description</source>
+        <translation>Apraksts</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+</context>
+<context>
+    <name>ToolTipItem</name>
+    <message>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
+        <source>Information</source>
+        <translation>Informācija</translation>
+    </message>
+</context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WSInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>Description</source>
+        <translation>Apraksts</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+</context>
+<context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Webservice Connection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="25"/>
+        <source>Status:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="32"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
+        <source>User ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
+        <source>Password</source>
+        <translation>Parole</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
+        <source>Upload</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WeightModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Type</source>
+        <translation>Tips</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Weight</source>
+        <translation>Svars</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="416"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="441"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="442"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="465"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="466"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+</context>
+<context>
+    <name>YearlyStatisticsModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <source>Year 
+ &gt; Month / Trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
+        <source>Duration 
+ Total</source>
+        <translation>Ilgums
+Kopā</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
+        <source>
+Average</source>
+        <translation>
+Vidējais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
+        <source>
+Shortest</source>
+        <translation>
+Īsakais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
+        <source>
+Longest</source>
+        <translation>
+Garākais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
+        <source>Depth (%1)
+ Average</source>
+        <translation>Dziļums (%1)
+Vidējais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
+        <source>
+Minimum</source>
+        <translation>
+Minimums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
+        <source>
+Maximum</source>
+        <translation>
+Maksimums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
+        <source>SAC (%1)
+ Average</source>
+        <translation>SAC (%1)
+Vidējais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
+        <source>Temp. (%1)
+ Average</source>
+        <translation>Temp. (%1)
+Vidējais</translation>
+    </message>
+</context>
+<context>
+    <name>gettextFromC</name>
+    <message>
+        <location filename="../dive.c" line="57"/>
+        <source>pascal</source>
+        <translation>paskāls</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="62"/>
+        <location filename="../qt-gui.cpp" line="348"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="66"/>
+        <location filename="../qt-gui.cpp" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="103"/>
+        <location filename="../qt-gui.cpp" line="327"/>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="108"/>
+        <location filename="../qt-gui.cpp" line="332"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="137"/>
+        <location filename="../qt-gui.cpp" line="232"/>
+        <location filename="../qt-gui.cpp" line="247"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="142"/>
+        <location filename="../qt-gui.cpp" line="235"/>
+        <location filename="../qt-gui.cpp" line="249"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="258"/>
+        <location filename="../qt-gui.cpp" line="268"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="191"/>
+        <location filename="../qt-gui.cpp" line="256"/>
+        <location filename="../qt-gui.cpp" line="266"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="1104"/>
+        <source>(%s) or (%s)</source>
+        <translation>(%s) vai (%s)</translation>
+    </message>
+    <message>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
+        <source>air</source>
+        <translation>gaiss</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="170"/>
+        <source>integrated</source>
+        <translation>integrēts</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="171"/>
+        <source>belt</source>
+        <translation>josta</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="172"/>
+        <source>ankle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="173"/>
+        <source>backplate weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="174"/>
+        <source>clip-on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
+        <source>Failed to read &apos;%s&apos;</source>
+        <translation>Neizdevas nolasīt &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
+        <source>Maximum number of supported columns on CSV import is %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>none</source>
+        <translation>neviens</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>deco stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ascent</source>
+        <translation>stāvums</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ceiling</source>
+        <translation>maksimālais augstums</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>workload</source>
+        <translation>darba slodze</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>transmitter</source>
+        <translation>raidītājs</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>violation</source>
+        <translation>pārkapšana</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>bookmark</source>
+        <translation>grāmatzīme</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>surface</source>
+        <translation>virsma</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>safety stop</source>
+        <translation>drošības pietura</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>gaschange</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (voluntary)</source>
+        <translation>drošības pietura (brīvprātīga)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (mandatory)</source>
+        <translation>drošības pietura (obligāta)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>deepstop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>ceiling (safety stop)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>divetime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <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="143"/>
+        <source>maxdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>airtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>rgbm</source>
+        <translation>rgbm</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>heading</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>tissue level warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>non stop time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="161"/>
+        <source>invalid event number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="403"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="409"/>
+        <source>Error registering the data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="417"/>
+        <source>Error parsing the datetime</source>
+        <translation>Kļūda laika parsēšanā</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="433"/>
+        <source>Dive %d: %s %d %04d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="438"/>
+        <source>Error parsing the divetime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="447"/>
+        <source>Error parsing the maxdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="456"/>
+        <source>Error parsing the gas mix count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="468"/>
+        <source>Error obtaining water salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="476"/>
+        <source>Error obtaining surface pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="484"/>
+        <source>Error parsing the gas mix</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="491"/>
+        <source>Error parsing the samples</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="621"/>
+        <source>Event: waiting for user action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="629"/>
+        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="689"/>
+        <source>Error registering the event handler.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="694"/>
+        <source>Error registering the cancellation handler.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="715"/>
+        <source>Dive data import error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="754"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="761"/>
+        <source>Unable to open %s %s (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="484"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1625"/>
+        <source>Failed to parse '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1626"/>
+        <source>Failed to parse &apos;%s&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1845"/>
+        <source>Database query get_events failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
+        <source>Database connection failed '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
+        <source>Database query failed '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <source>Can&apos;t open stylesheet %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
+        <source>EAN%d</source>
+        <translation>EAN</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="132"/>
+        <source>Can&apos;t find gas %d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="324"/>
+        <source>Too many gas mixes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="504"/>
+        <source>%s
+Subsurface dive plan
+based on GFlow = %.0f and GFhigh = %.0f
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="545"/>
+        <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="554"/>
+        <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="565"/>
+        <source>Switch gas to %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="573"/>
+        <source>Gas consumption:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="584"/>
+        <source>%.0f%s of %s
+</source>
+        <translation>%.0f%s no %s
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="783"/>
+        <source>ean</source>
+        <translation>ean</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1234"/>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1238"/>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1247"/>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
+        <source>%sT: %d:%02d min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
+        <source>%s %sD:%.1f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1430"/>
+        <source>%s %sD:%.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1434"/>
+        <source>%s%sV:%.2f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
+        <source>%s %sV:%.2f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1449"/>
+        <source>%s %sP:%d %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="308"/>
+        <source>C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="311"/>
+        <source>F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="498"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="511"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="524"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="529"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>boat</source>
+        <translation>kuģis</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>shore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>drift</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>deep</source>
+        <translation>dziļums</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>cavern</source>
+        <translation>ala</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>ice</source>
+        <translation>ledus</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>wreck</source>
+        <translation>šķembas</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>cave</source>
+        <translation>ala</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>altitude</source>
+        <translation>augstiene</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>pool</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>lake</source>
+        <translation>ezers</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>river</source>
+        <translation>upe</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>night</source>
+        <translation>nakts</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation>svaigs</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation>students</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
+        <source>deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="216"/>
+        <source>more than %d days</source>
+        <translation>vairāk nekā %d dienas</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="222"/>
+        <source>%dd %dh %dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dh %dmin</source>
+        <translation>%dst %dmin</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="235"/>
+        <source>for dives #</source>
+        <translation>priekš niršanas #</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="242"/>
+        <source>for selected dives</source>
+        <translation>priekš izvēlētām niršanām</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="277"/>
+        <source>for dive #%d</source>
+        <translation>priekš niršanas #%d</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="279"/>
+        <source>for selected dive</source>
+        <translation>priekš izvēlētai niršanai</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="281"/>
+        <source>for all dives</source>
+        <translation>priekš visām niršanām</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="283"/>
+        <source>(no dives)</source>
+        <translation>(nav niršanas)</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sun</source>
+        <translation>Svēt</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Mon</source>
+        <translation>Pirm</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Tue</source>
+        <translation>Otr</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Wed</source>
+        <translation>Treš</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Thu</source>
+        <translation>Cet</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Fri</source>
+        <translation>Piekt</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sat</source>
+        <translation>Sest</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jan</source>
+        <translation>Jan</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Feb</source>
+        <translation>Feb</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Mar</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Apr</source>
+        <translation>Apr</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>May</source>
+        <translation>Maijs</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jun</source>
+        <translation>Jūn</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Jul</source>
+        <translation>Jūl</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Aug</source>
+        <translation>Aug</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Oct</source>
+        <translation>Okt</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Dec</source>
+        <translation>Dec</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="24"/>
+        <source>Uemis Zurich: File System is almost full
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="107"/>
+        <source>unknown</source>
+        <translation>nezināms</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="379"/>
+        <source>Reading %s %s</source>
+        <translation>Nolasa %s %s</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="399"/>
+        <source>data</source>
+        <translation>dati</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>divelog entry id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="422"/>
+        <source>divespot data id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="424"/>
+        <source>more data dive id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>wetsuit</source>
+        <translation>Slapjš kostīms</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>semidry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>drysuit</source>
+        <translation>Sauss kostīms</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>vest</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>long john</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>jacket</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>full suit</source>
+        <translation>Pilns kostīms</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>2 pcs full suit</source>
+        <translation>2-daļu kostīms</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="620"/>
+        <source>membrane</source>
+        <translation>membrāna</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="802"/>
+        <source>Init Communication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="804"/>
+        <source>Uemis init failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="815"/>
+        <source>Start download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="196"/>
+        <source>Safety Stop Violation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="198"/>
+        <source>Speed Alarm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="201"/>
+        <source>Speed Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="203"/>
+        <source>PO2 Green Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="206"/>
+        <source>PO2 Ascend Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="208"/>
+        <source>PO2 Ascend Alarm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="212"/>
+        <source>Tank Pressure Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="214"/>
+        <source>RGT Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="216"/>
+        <source>RGT Alert</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="218"/>
+        <source>Tank Change Suggested</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="220"/>
+        <source>Depth Limit Exceeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="222"/>
+        <source>Max Deco Time Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="224"/>
+        <source>Dive Time Info</source>
+        <translation>Niršanas laika informācija</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="226"/>
+        <source>Dive Time Alert</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="228"/>
+        <source>Marker</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="230"/>
+        <source>No Tank Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="232"/>
+        <source>Low Battery Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="234"/>
+        <source>Low Battery Alert</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 ed8f18825..3d5f09f6b 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importer fil (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Feltseparator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Feltkonfigurasjon</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importer CSV-fil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Dybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Stoppdybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Prekonfigurerte importer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Åpne CSV-loggfil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Trykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Starttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Sluttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Gassbytte ved</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>ft³</translation>
     </message>
 </context>
 <context>
@@ -172,35 +94,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Enhets-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Klikk her for å fjerne denne computeren.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Bytter til OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> start</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>ft³/min</translation>
     </message>
@@ -208,101 +173,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Vis søkeboks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>vis alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>slå sammen alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>slå sammen andre turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>fjern dykk fra tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>legg til ny tur over denne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>slå sammen tur med turen over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>slå sammen tur med turen under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>slett dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>merk dykk som skjult</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>eksporter som UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>forskyvning av tidspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>last opp til divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Lagre dykk som...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>slå sammen valgte dykk</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Feltseparator</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Feltkonfigurasjon</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Dybde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Stoppdybde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Enheter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrisk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Britiske mål</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Emner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Sted</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notater</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Vekt</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -344,22 +468,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Handler Position-feil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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.
@@ -369,37 +493,37 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gass</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Forkaste planen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Du er i ferd med å forkaste planen.</translation>
     </message>
@@ -407,85 +531,158 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Punkter i dykkeplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Tilgjengelige gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>legg til datapunkt</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>dato</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Trykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>pund</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>drakt</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>flaske</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>sted</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>pO₂</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>dato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>drakt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>flaske</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>sted</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maks CNS</translation>
     </message>
@@ -493,115 +690,115 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Ugyldig svar fra tjener</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Laster opp liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Laster ned liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Laster ned %1 dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Nedlasting er ferdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Nedlastingen er skadet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Opplasting feilet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Ferdig å laste opp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Innlogging feilet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke lese svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Feil: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Opplasting er ferdig</translation>
     </message>
@@ -609,48 +806,54 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Prøv igjen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -718,7 +921,7 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Rediger valgte steder</translation>
     </message>
@@ -727,13 +930,13 @@ 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="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -759,11 +962,13 @@ Fjern dem før du gjør dette.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>Vanntemp.</translation>
     </message>
@@ -789,7 +994,7 @@ Fjern dem før du gjør dette.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
@@ -900,92 +1105,102 @@ Fjern dem før du gjør dette.</translation>
         <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flasker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Legg til flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Vekter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Legg til vektsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Tursted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Turnotater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Denne turen redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flere dykk redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Dette dykket redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -993,428 +1208,518 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Åpne l&amp;oggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Åpne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importer filer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Eksporter &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer fra &amp;dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>Rediger &amp;enhetsnavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>Nummere&amp;r på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Bytt &amp;zoom</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Årlig statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Liste over dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Bruker&amp;manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanlegg dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importer CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importer CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importer fra divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Nytt dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Autogruppering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Forrige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Neste DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Høyre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Velg hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Legg inn plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Brukermanual</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Finner ikke manualen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Lagre endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Avslutt redigeringa før du redigerer et nytt.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Årsstatistikk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1484,209 +1789,187 @@ Fjern dem før du gjør dette.</translation>
         <translation>Bruk standardflaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personaliser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Standard for system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Trykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Tidsenheter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Enhet for opp-/nedstigningshastighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>grenseverdi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>maks ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Tak fra dykkecomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>vis tak med rød farge</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Kalkulert tak</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>vis alle vev</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3-meterstrinn</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Regn ut NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GF lav ved maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Ymse</translation>
     </message>
@@ -1696,37 +1979,32 @@ Fjern dem før du gjør dette.</translation>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GF lav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GF høy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Programmet må startes på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Åpne standardlogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1734,22 +2012,22 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Forhåndsvisning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -1872,216 +2150,116 @@ Fjern dem før du gjør dette.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Legg til gassbytte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Legg til bokmerke</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Fjern hendelse</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Skjul lignende hendelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Skjul hendelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Skjul alle %1 hendelser?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Fjern den valgte hendelsen?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>ukjent dykkecomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Varighet: 10 minutter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Målestokk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Linjal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Mål egenskaper ved dykk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Skaler dykket til skjermstørrelsen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Rediger</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Bytter til OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> start</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> slutt</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Dykk nr. %1- %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Varighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Gass brukt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Mac. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Vekter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Dykkeleder:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Legg til gassbytte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Legg til bokmerke</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Fjern hendelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Skjul lignende hendelser</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <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="36"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Fjern dette punktet</translation>
     </message>
@@ -2091,22 +2269,22 @@ Fjern dem før du gjør dette.</translation>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Gjennomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <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>
@@ -2124,6 +2302,59 @@ Fjern dem før du gjør dette.</translation>
         <translation>Nytt startnummer</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Flytt valgte tidspunkter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>tidligere</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>senere</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2160,20 +2391,25 @@ Fjern dem før du gjør dette.</translation>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multiplattform dykkelogg&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel med flere, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Lisens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Webside</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Lukk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2183,37 +2419,37 @@ Fjern dem før du gjør dette.</translation>
         <translation>Nettjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Kobler til...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Nedlasting er ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Feil ved nedlasting: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Feil med forbindelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruker-ID!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke lese svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Ferdig å laste ned</translation>
     </message>
@@ -2229,17 +2465,17 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2247,20 +2483,33 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informasjon</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Brukermanual</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Finner ikke manualen</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2283,32 +2532,32 @@ Fjern dem før du gjør dette.</translation>
         <translation>Skriv ID-en din her</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Last ned</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Bruker-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Last opp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Handlingen fikk tidsavbrudd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -2316,117 +2565,117 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Varighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Lengst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dybde (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2442,25 +2691,25 @@ Snitt</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -2493,17 +2742,17 @@ Snitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -2535,20 +2784,16 @@ Snitt</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Kunne ikke åpne &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Klarte ikke å lese &apos;%s&apos;. Bruk CSV-importen isteden.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maks antall kolonner i CSV-importen er %d</translation>
     </message>
@@ -2690,17 +2935,17 @@ Snitt</translation>
         <translation>ugyldig hendelsesnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Feil ved registrering av data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Feil ved lesing av dato</translation>
     </message>
@@ -2715,133 +2960,158 @@ Snitt</translation>
         <translation>Feil ved lesing av dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Klarte ikke å hente overflatetrykk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Feil ved lesing av gassmiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Feil ved lesing av detaljer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Hendelse: Venter på bruker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Feil ved import av dykkedata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fikk ikke åpnet %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Rar lesing av prosent %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Kunne ikke lese &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kunne ikke lese &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Databasespørring get_events feilet.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Databaseforbindelse feilet &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Databasespørring feilet &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Finner ikke gassen %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>For mange gassmikser</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2854,274 +3124,262 @@ basert på GF lav = %.0f og GF høy = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Bytt gass til %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Gasskonsum:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s på %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Kalkulert tak %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Vev %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Sikkerhetsstopp:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Sikkerhetsstopp: ukjent tid @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deko:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deko:ukjent tid @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-I deko</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deko:%umin @ %.0f %s (kalk.)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-I deko (kalk.)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (kalk.)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (kalk.)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dykk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dykk)</translation>
     </message>
@@ -3221,142 +3479,142 @@ TTS:%umin (kalk.)</translation>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>mer enn %d dager</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dt %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>for dykk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>for dykk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>for alle dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(ingen dykk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>des</translation>
     </message>
@@ -3386,187 +3644,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Er Uemis Zurich plugget i ordentlig?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Leser %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>id for oppføring i logg</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>id for dykkesteddata</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>mer data dykke-id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>våtdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>tørrdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>ermeløs våtdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>overdel</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>hel drakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>todelt drakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>skalldrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Start kommunikasjon</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Klarer ikke å lese fra Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Start nedlasting</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Brudd på sikkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm: oppstigningshastighet</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Advarsel: oppstigningshastighet</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Advarsel: grønn / pO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Advarsel: oppstigning / pO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarm: oppstigning / pO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Info: tanktrykk</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Advarsel: gjenværende gasstid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alarm: gjenværende gasstid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Tankbytte foreslått</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Maksgrense for dybde overskredet</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Advarsel: maks dekotid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Info: dykketid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alarm: dykketid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Markering</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Ingen tankinformasjon</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Advarsel: dårlig batteri</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarm: dårlig batteri</translation>
     </message>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 04fe05b9a..f0f04d9c3 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Bestand Importeren (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Scheiding tussen velden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Veld Configuratie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>CSV bestand importeren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Tijd</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Diepte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temperatuur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Stop diepte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Vooraf ingestelde import</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>CSV logboek openen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV Bestanden (*.csv);;Alle Bestanden (*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Wissel op</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Fles kan niet verwijderd worden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Toestel ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Apparaatnaam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Klik hier om deze duikcomputer te verwijderen.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>lucht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Schakel om naar OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> begin</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>lucht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -209,101 +174,260 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Zoekvak Tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>alles inklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>nieuwe duik aanmaken hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>trip samenvoegen met trip hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>trip samenvoegen met trip hieronder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>markeer duik(en) als ongeldig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>bewaren Als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>tijdstippen verschuiven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation>afbeeldingen laden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>duik(en) laden op divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Duiken Bewaren Als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Bestand Bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation>Afbeelding openen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <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="730"/>
         <source>merge selected dives</source>
         <translation>geselecteerde duiken samenvoegen</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Scheiding tussen velden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Veld Configuratie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Diepte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Stop diepte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temperatuur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Eenheden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrisch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperiaal</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation>Handmatige duiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation>Duik #</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation>Max diepte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation>Gemiddelde diepte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notities</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Geleider Positie Fout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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.
@@ -370,37 +494,37 @@ Verwijder deze eerst.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Verbruikt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Plan verwijderen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>U staat op het punt het plan te verwijderen</translation>
     </message>
@@ -408,85 +532,158 @@ Verwijder deze eerst.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Duikplanner punten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Beschikbare Gassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>duik punt toevoegen</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>Nr.</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>datum</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation>Kleur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation>Ingevoerd door gebruiker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>US pond</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation>Fles index</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>duikpak</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation>Druk S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>fles</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation>Druk I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>locatie</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation>Plafond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>PHE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>US pond</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>duikpak</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>fles</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>locatie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -494,115 +691,115 @@ Verwijder deze eerst.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Ongeldig antwoord van de server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>geen duiken geselecteerd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>kan zip bestand voor opladen niet aanmaken: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>kan tijdelijk bestand niet aanmaken: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>Interne fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>interne fout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Duiklijst wordt opgeladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Duiklijst wordt geladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 duiken worden geladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Download klaar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Beschadigde download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Opladen mislukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Opladen gelukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Login mislukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Kan antwoord niet correct ontleden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Opladen klaar</translation>
     </message>
@@ -610,48 +807,54 @@ Verwijder deze eerst.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Uemis duikcomputer zoeken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Log bestanden (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump bestanden (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ Verwijder deze eerst.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Bewerk geselecteerde duiklocaties</translation>
     </message>
@@ -728,13 +931,13 @@ Verwijder deze eerst.</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Duiknotities</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
@@ -760,11 +963,13 @@ Verwijder deze eerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Water temp</translation>
     </message>
@@ -790,7 +995,7 @@ Verwijder deze eerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
@@ -901,92 +1106,102 @@ Verwijder deze eerst.</translation>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Gewichten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Gewichtssysteem toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Trip locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Trip Nota&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Deze trip wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Meerdere duiken worden bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Deze duik wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -994,428 +1209,518 @@ Verwijder deze eerst.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nieuw logboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Logboek &amp;Openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>Bewaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Opslaan als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Bestanden importeren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>&amp;UDDF Exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation>EAD, EED, END inschakelen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>Afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importeren uit &amp;duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>Namen toestellen wijzigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>Hernummeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>&amp;Zoom in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Jaarlijkse Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Duiklijst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Handleiding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Wereldbol</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Duik P&amp;lannen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>CSV importeren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>CS&amp;V importeren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importeren van Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation>MOD inschakelen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation>Toon door duikcomputer aangegeven plafond</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation>Toon berekend plafond</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <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"/>
+        <source>Calculate All Tissues</source>
+        <translation>Bereken alle compartimenten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation>Toon SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation>In-/Uitschakelen Meetlat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Duik Toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Automatisch Groeperen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Vorige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Volgende DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>gebeurtenissen selecteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Voer plan in</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation>Importeer logboeken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <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="878"/>
+        <source>&amp;Full Screen</source>
+        <translation>Volledig scherm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation>Volledig Scherm in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Handleiding</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>De handleiding kan niet gevonden worden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Aanpassingen opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Bestand Bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Jaarlijkse statistieken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation>Open Duiklogboek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <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>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ Verwijder deze eerst.</translation>
         <translation>Gebruik standaard fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personaliseren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>voet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation>drempelwaarde wanneer pO₂ getoond wordt</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation>drempelwaarde wanneer pN₂ getoond wordt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation>drempelwaarde wanneer pHe getoond wordt</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation>max ppO₂ wanneer MOD getoond wordt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <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="655"/>
+        <source>unused tanks</source>
+        <translation>niet gebruikte flessen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Systeem Standaardinstelling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Tijdseenheden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Stijg-/daalsnelheid noemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Seconden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>drempelwaarde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Plafond gerapporteerd door duikcomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>plafond in het rood tekenen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Berekend plafond</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>alle compartimenten tonen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m stappen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>NDL/TTS Berekenen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow op max diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Allerlei</translation>
     </message>
@@ -1697,37 +1980,32 @@ Verwijder deze eerst.</translation>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>Gasverbruik</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Herstarten noodzakelijk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Standaard Logboek Openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Verwijder deze eerst.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Voorbeeldweergave</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Afd&amp;rukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Afdrukken</translation>
     </message>
@@ -1873,216 +2151,116 @@ Verwijder deze eerst.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Gaswissel toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Bladwijzer toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Gebeurtenis verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Gelijkaardige gebeurtenissen verbergen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Toon alle gebeurtenissen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Gebeurtenissen verbergen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Alle %1 gebeurtenissen verbergen?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Geselecteerde gebeurtenis verwijderen?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>onbekende duikcomputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Duur instellen: 10 minuten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Schaal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Meetlat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Eigenschappen van duiksegmenten berekenen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Duik aan schermgrootte aanpassen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Bewerken</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>lucht</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Schakel om naar OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> begin</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> eind</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Duik #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Max diepte: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Duur: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Verbruikt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Gewichten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Nota&apos;s:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Zichtbaarheid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Beoordeling:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Gaswissel toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Bladwijzer toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Gebeurtenis verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Gelijkaardige gebeurtenissen verbergen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Toon alle gebeurtenissen</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Dit punt verwijderen</translation>
     </message>
@@ -2092,22 +2270,22 @@ Verwijder deze eerst.</translation>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Gemiddelde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Kleinste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Grootste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <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>
@@ -2125,6 +2303,59 @@ Verwijder deze eerst.</translation>
         <translation>Nieuw beginnummer</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Geselecteerde tijdsstippen verschuiven</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation>Tijdsstip voor afbeelding(en) verschuiven met</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>vroeger</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>later</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation>Bereken tijdsverschil met camera</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <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="193"/>
+        <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="181"/>
+        <source>Open Image File</source>
+        <translation>Afbeelding openen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Verwijder deze eerst.</translation>
         <translation>Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&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, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Licentie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Website</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Sluiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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>&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 duiklog programma&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, en anderen, 2011-2014&lt;/span&gt;</translation>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Verwijder deze eerst.</translation>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Verbinding wordt opgezet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Download klaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Download fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Verbindingsfout:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Ongeldige gebruikersidentificatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Kan antwoord niet parsen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Laden succesvol voltooid!</translation>
     </message>
@@ -2230,17 +2466,17 @@ Verwijder deze eerst.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ Verwijder deze eerst.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Handleiding</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>De handleiding kan niet gevonden worden</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ Verwijder deze eerst.</translation>
         <translation>Geef uw ID in</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Downloaden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Gebruikers ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Uploaden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Operatie duurt te lang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Gegevens worden overgebracht...</translation>
     </message>
@@ -2317,117 +2566,117 @@ Verwijder deze eerst.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jaar
  &gt; Maand / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Duur
  Totaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Kortste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Langste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Diepte (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>Gasverbruik (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2443,25 +2692,25 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2494,17 +2743,17 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) of (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
@@ -2536,20 +2785,16 @@ Maximum</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fout bij lezen van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>&apos;%s&apos; lezen is mislukt. Gebruik Importeren voor CSV bestanden.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation>
     </message>
@@ -2658,7 +2903,7 @@ Maximum</translation>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>PO2</source>
-        <translation>PO2</translation>
+        <translation>PO₂</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
@@ -2691,17 +2936,17 @@ Maximum</translation>
         <translation>ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Fout bij het registreren van de data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
@@ -2716,133 +2961,162 @@ Maximum</translation>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Event: wachten op handeling van gebruiker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Fout bij importeren van duikdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Vreemde percentage %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Fout bij analyseren van &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Database-query get_events mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation>Database query get_tags mislukt.
+</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Databaseconnectie is mislukt &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database-query mislukt: &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation>Database query get_cylinders mislukt.
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation>Database query get_changes mislukt.
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation>Database query get_profile_sample mislukt.
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan de stylesheet %s niet openen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Kan gasmengsel %d/%d niet vinden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Teveel gasmengsels</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,274 +3129,290 @@ Gebaseerd op GFlow =  %.0f en GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Gaswissel naar %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Gasverbruik:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Berekend plafond %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Compartiment %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Veiligheidsstop:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-gasverbruik:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Veiligheidsstop:onbek.tijd @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco:onbek.tijd @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-In deco</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation>@: %d:%02d
+D: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation>P: %d%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation>T: %.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation>V: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation>SAC: %2.1fl/min
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation>CNS: %u%%
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (berekend)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation>pO₂%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-In deco (berekend)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation>pN₂%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (berekend)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation>pHe: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (berekend)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation>MOD: %d%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation>Veiligheidsstop: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation>Veiligheidsstop: onbek tijd @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation>Deco: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation>Deco: onbek tijd @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation>In deco
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation>NDL: %umin
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation>Deco: %umin @ %.0f%s (berekend)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation>In deco (berekend)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation>NDL: %umin (berekend)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation>TTS: %umin (berekend)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation>Berekend plafond %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation>Compartiment %.0fmin: %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation>hartslag: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation>koers: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 duiken)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 duik)</translation>
     </message>
@@ -3222,142 +3512,142 @@ TTS:%umin (berekend)</translation>
         <translation>decompressie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>meer dan %d dagen</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>voor duik nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>voor de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>Voor duik nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>voor de geselecteerde duik</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>voor alle duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(geen duiken)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -3387,187 +3677,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Is de Uemis Zurich correkt aangesloten?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Lezen %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>gegevens</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>Duiklog gegeven ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>Duiklocatie data ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>meer data voor duik ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>natpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semidroog</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>droogpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>jack</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>tweedelig pak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2-delig pak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membraan droogpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Initialiseer communicatie</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis niet geïnitialiseerd</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Begin download</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>veiligheidsstop overtreding</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm: snelheid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Waarschuwing: snelheid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
-        <translation>Waarschuwing: PO2 Groen</translation>
-    </message>
-    <message>
-        <location filename="../uemis.c" line="204"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Waarschuwing: Opstijging / PO2</translation>
+        <translation>Waarschuwing: PO₂ Groen</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: Opstijging / PO2</translation>
+        <source>PO2 Ascend Warning</source>
+        <translation>Waarschuwing: Opstijging / PO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="208"/>
+        <source>PO2 Ascend Alarm</source>
+        <translation>Alarm: Opstijging / PO₂</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Info: Flesdruk</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Waarschuwing: resterende gas-tijd</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alarm: resterende gas-tijd</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Fleswissel voorgesteld</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Dieptelimiet overschreden</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Waarschuwing: Maximale deco-tijd</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Info: Duiktijd</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alarm: Duiktijd</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Markering</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Geen flesinformatie</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Waarschuwing:Lege batterij</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarm: Lege batterij</translation>
     </message>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 4fa770815..9dc92d7e2 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importuj plik (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Separator danych</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Konfiguracja pól</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importuj plik CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Czas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Głębokość</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Przystanek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Predefiniowane konfiguracje</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Otwórz plik CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>Pliki CSV (*.csv);;Wszytkie pliki(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Pojemność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Ciś. robocze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Ciś. początkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Ciś. końcowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Zmiana na</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Butla nie może być usunięta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>ID urządzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Kliknięcie tu usunie komputer nurkowy.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>powietrze</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Przejście na obieg otwarty</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> początek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>powietrze</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -209,101 +174,260 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Pokaż okno wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>zwiń pozostałe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>usuń nurkowanie(a) z grupy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>utwórz nową grupę powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <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="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>usuń nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>oznacz nurkowanie(a) jak niepoprawne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>eksportuj jako plik UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>zmień czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Wyślij nurkowanie(a) do divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Zapisz nurkowania jako...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>połącz wybrane nurkowania</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Separator danych</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Konfiguracja pól</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Głębokość</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Przystanek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Jednostki</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metryczny</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperialny</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Opis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Balast</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Niedozwolone położenie punktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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ę
@@ -370,37 +494,37 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Głębokość końcowa </translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Używany gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Porzucić plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Masz zamiar porzucić plan</translation>
     </message>
@@ -408,85 +532,158 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Plan nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>dodaj punkt do profilu</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>data</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>skafander</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>butla</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>miejsce</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>data</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>skafander</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>butla</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>miejsce</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -494,115 +691,115 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Niepoprawna odpowiedź z serwera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>nie wybrano żadnych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>nie udało się utworzyć pliku zip do wysłania: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>nie można utworzyć pliku tymczasowego: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>błąd wewnętrzny: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>błąd wewnętrzny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Zakończ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Wysyłanie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Pobieranie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Pobieranie %1 nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Zakończono pobieranie - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Pobrano uskodzone dane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Wysyłanie nieudane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Wysyłanie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Błąd logowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Nie można przetworzyć odpowiedzi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Błąd: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Wysyłanie zakończone</translation>
     </message>
@@ -610,48 +807,54 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Ponów</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Pliki logów (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Pliki binarne (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Wskaż miejsce zaznaczonych nurkowań</translation>
     </message>
@@ -728,13 +931,13 @@ 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="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
@@ -760,11 +963,13 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Temperatura wody</translation>
     </message>
@@ -790,7 +995,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
@@ -901,92 +1106,102 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Dodaj butlę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Dodaj balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Miejsce nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Opis nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Ta grupa nurkowań jest obecnie edytowana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Kilka nurkowań jest obecnie edytowanych.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>To nurkowanie jest obecnie edytowane.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -994,428 +1209,518 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>Nowy logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Otwórz logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importuj pliki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Eksportuj UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importuj z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>Edycja nazw komputerów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Zmiana skali</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Lista nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Zaplanuj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importuj plik CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importuj plik CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importuj z Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Dodaj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Automatycznie grupuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Poprzedni komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>W lewo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Następny komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>W prawo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Wybór zdarzeń</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Wprowadź plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>instrukcja obsługi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Nie można znaleźć dokumentacji Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Zapisać zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Dokończ edycję tego nurkowania przed rozpoczęciem kolejnej. </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Statystyka roczna</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Użyj domyślnej butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metryczny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperialny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Dostosuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>metry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>stopy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>litry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>stopy sześcienne (cu ft)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>stopnie Celsjusza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>stopnie Fahrenheita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Domyślne ustawienia systemu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Objętość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Jednostki czasu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Mianownik szybkości zanurzania/wynurzania </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>próg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Sufit dekompresyjny z komputera nurkowego </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>rysuj sufit na czerwono</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Obliczony sufit dekompresjny</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>wszystkie tkanki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>z krokiem 3m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Obliczenia NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow na maksymalnej głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
@@ -1697,37 +1980,32 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Wymagane ponowne uruchomienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Otwórz domyślny plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Podgląd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Drukuj</translation>
     </message>
@@ -1873,216 +2151,116 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Dodaj zmianę gazu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Dodaj notatkę</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Usuń znacznik</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Ukryj podobne znaczniki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Odkryj wszystkie znaczniki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Ukryj znaczniki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Ukryć %1 znaczniki?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Usunąć wybrane znaczniki?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>nieznany komputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Ustaw czas trwania: 10 minut</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Skala</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Linijka</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Pomiar parametrów fragmentu nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Skalowanie profilu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Edytuj</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>powietrze</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Przejście na obieg otwarty</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> początek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> koniec</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Nurkownie #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Max głębokość: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Czas: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Użyty gaz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Balast:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Widzialność:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Ocena:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Dodaj zmianę gazu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Dodaj notatkę</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Usuń znacznik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Ukryj podobne znaczniki</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Odkryj wszystkie znaczniki</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Usuń ten punkt</translation>
     </message>
@@ -2092,22 +2270,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation>
     </message>
@@ -2125,6 +2303,59 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Nowy numer początkowy</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Zmiana czasów nurkowań</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>wcześniej</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>później</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Wieloplatformowy log nurkowy&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel i inni, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>Licencja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>Strona WWW</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Pobieranie zakończone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Błąd pobierania: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Błąd połączenia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Niepoprawny identyfikator użytkownika!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Nie można przetworzyć odpowiedzi!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Pobieranie zakończone sukcesem!</translation>
     </message>
@@ -2230,17 +2466,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informacje</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>instrukcja obsługi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Nie można znaleźć dokumentacji Subsurface</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Podaj swoje ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>ID użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Przekroczony czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Przesyłanie danych...</translation>
     </message>
@@ -2317,112 +2566,112 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Miesiąc / grupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Czas trwania
 całkowity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>najkrótszy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>najdłuższy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Głębokość (%1)
  średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>minimalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -2438,25 +2687,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2489,17 +2738,17 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
@@ -2531,20 +2780,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Błąd odczytu &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Nie udało sie odczytać &apos;%s&apos;. Użyj importu z pliku CSV.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation>
     </message>
@@ -2686,17 +2931,17 @@ Maximum</source>
         <translation>niepoprawny znacznik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
@@ -2711,133 +2956,158 @@ Maximum</source>
         <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <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="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Podejrzany skład procentowy %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Nie udało się przetworzyć &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <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="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Błąd połączenia z bazą danych &apos;%s&apos;.⏎
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <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="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <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="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Nie znaleziono gazu %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Zbyt wiele rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2850,274 +3120,262 @@ w oparciu o GFlow = %.0f oraz GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation>Przejście do  %.*f %s w %d:%02d min - runtime %d:%02u z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Zmiana gazu na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Zużycie gazu:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Obliczony sufit %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Tkanka %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Przyst. bezp.:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-Gł:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Przyst. bezp.:nieznany czas @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco:nieznany czas @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-dekompresja</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (obliczone)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-deco (obliczone)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 nurkowanie)</translation>
     </message>
@@ -3217,142 +3475,142 @@ TTS:%umin (calc)</translation>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>więcej niż %d dni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>dla nurkowania nr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>dla wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>dla nurkowania #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>dla wybranego nurkowania</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>dla wszystkich nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(brak nurkowań)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
@@ -3382,187 +3640,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Czy Uemis Zurich jest podłączony poprawnie?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Czytanie %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>dane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>wpis dziennika nurkowego id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>dane o miejscu nurkowania</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>dane nurkowania id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>mokry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>półsuchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>suchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>krótki</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>kamizelka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>długi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>kurtka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>pełna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>pełna dwuczęściowa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membranowy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Nawiązywanie łączności</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Błąd inicjalizacji Uemis </translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Rozpocznij pobieranie</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Pominięcie przystanku bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm prędkości wynurzania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Ostrzeżenie: prędkość wynurzania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Ostrzeżenie: PO2 zielone</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Ostrzeżenie: wynurzanie / PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarm: wynurzanie / PO2 </translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Ciśnienie w butli</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Ostrzeżenie: ilość gazu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alarm: ilość gazu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Zalecana zmiana gazu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Przekroczenie limitu głębokości</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Ostrzeżenie: maksymalny czas dekompresji</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Informacja: czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alarm: czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Znacznik</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Brak danych o butli</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Ostrzeżenie: niski poziom baterii</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarm: niski poziom baterii</translation>
     </message>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index 2e78e1929..db773ee9a 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importar ficheiro (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Separador de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Configuração de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importar ficheiro CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Tempo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Profundidade</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Profundidade da paragem</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Importar pré-definições </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Abrir arquivo CSV Log</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Trocar aos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <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="151"/>
+        <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>
+        <translation>Ao clicar aqui irá eliminar este cilindro.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
-        <translation>A garrafa não pode ser eliminada</translation>
+        <translation>Cilindro não pode ser eliminado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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>
+        <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>pés cúbicos</translation>
     </message>
 </context>
 <context>
@@ -166,42 +88,85 @@
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation>Tem a certeza que deseja
-remover o computador de mergulho seleccionado?</translation>
+        <translation>Tem a certeza que deseja remover
+o computador de mergulho selecionado?</translation>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>ar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <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="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>início</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>ar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>pés cúbicos/min</translation>
     </message>
@@ -209,112 +174,271 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
-        <translation>Mostrar caixa de busca</translation>
+        <translation>Mostrar caixa de pesquisa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>colapsar outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>criar nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
-        <source>merge trip with trip above</source>
-        <translation>juntar viagem com a viagem acima</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
-        <source>merge trip with trip below</source>
-        <translation>juntar viagem com a viagem abaixo</translation>
-    </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <source>merge trip with trip above</source>
+        <translation>mesclar viagem com a viagem acima</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
+        <source>merge trip with trip below</source>
+        <translation>mesclar viagem com a viagem abaixo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
-        <translation>eliminar mergulho(s)</translation>
+        <translation>apagar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>salvar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
-        <translation>mudar os tempos</translation>
+        <translation>deslocar os tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
-        <source>upload dive(s) to divelogs.de</source>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
+        <source>upload dive(s) to divelogs.de</source>
+        <translation>enviar mergulho(s) para divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Gravar mergulhos como...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
-        <translation>Salvar aquivo como</translation>
+        <translation>Salvar arquivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
+        <translation>Arquivos UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>mesclar mergulhos selecionados</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Separador de campos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Configuração de campos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Profundidade</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Profundidade da parada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Horário</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Unidades</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <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"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Rótulos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Parceiro</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation>Consumo no fundo</translation>
+        <translation>SAC no fundo</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
-        <translation>Consumo na parada de descompressão</translation>
+        <translation>SAC na parada de descompressão</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="78"/>
@@ -334,159 +458,232 @@ remover o computador de mergulho seleccionado?</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
-        <translation>Hora de início</translation>
+        <translation>Horário de início</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
-        <translation>Pressão atmosférica</translation>
+        <translation>Pressão em ATM</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
-        <translation>30ft</translation>
+        <translation>30 pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Erro na posição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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>
+        <translation>Uma ou mais paradas de deco serão eliminadas com estas operações.
+Por favor, remova-as primeiro.</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gás utilizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Descartar o planejamento?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
-        <translation>Está prestes a eliminar o planejamento.</translation>
+        <translation>Você está prestes a eliminar seu planejamento.</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Pontos do plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Gases disponíveis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>adicionar ponto ao mergulho</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Horário</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Pressão</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>nº</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
         <source>ft</source>
-        <translation>ft</translation>
+        <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
         <source>suit</source>
-        <translation>fato</translation>
+        <translation>roupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
         <source>cyl</source>
-        <translation>garrafa</translation>
+        <translation>cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
         <source>location</source>
         <translation>local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>SAC</source>
-        <translation>Consumo</translation>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>CNS máx</translation>
     </message>
@@ -494,165 +691,172 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
-        <translation type="unfinished"/>
+        <translation>Resposta inválida do servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation type="unfinished"/>
+        <translation>Esperava rótulo XML &apos;DiveDateReader&apos;, recebido &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation type="unfinished"/>
+        <translation>Rótulo XML &apos;DiveDates&apos; esperado não foi encontrado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Resposta XML defeituosa. Linha %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
-        <translation type="unfinished"/>
+        <translation>nenhum mergulho selecionado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
-        <translation type="unfinished"/>
+        <translation>falha ao criar arquivo zip para envio: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
-        <translation type="unfinished"/>
+        <translation>falha ao criar arquivo temporário: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
-        <translation type="unfinished"/>
+        <translation>erro interno: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
-        <translation type="unfinished"/>
+        <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Finalizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Enviando lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Recebendo lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
-        <source>Download finished - %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
-        <source>Corrupted download</source>
-        <translation type="unfinished"/>
+        <translation>Recebendo %1 mergulhos...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <source>Download finished - %1</source>
+        <translation>Recebimento terminado - %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <source>Corrupted download</source>
+        <translation>Recebimento inválido</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
-        <source>Upload failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
-        <source>Upload successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
-        <source>Login failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
-        <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>O arquivo não pode ser aberto:
+%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
-        <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <source>Upload failed</source>
+        <translation>Envio falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
+        <source>Upload successful</source>
+        <translation>Envio bem sucedido</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
+        <source>Login failed</source>
+        <translation>Abertura de sessão (login) falhou</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
+        <source>Cannot parse response</source>
+        <translation>Falha na análise da resposta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
+        <source>Error: %1</source>
+        <translation>Erro: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
-        <translation type="unfinished"/>
+        <translation>Enviado finalizado</translation>
     </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
-        <translation>Repetir</translation>
+        <translation>Tentar novamente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
-        <translation type="unfinished"/>
+        <translation>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
-        <translation type="unfinished"/>
+        <translation>Arquivos de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
-        <translation type="unfinished"/>
+        <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
-        <translation type="unfinished"/>
+        <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
-        <translation type="unfinished"/>
+        <translation>Arquivos de saída (*.bin)</translation>
     </message>
 </context>
 <context>
@@ -665,7 +869,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
         <source>Vendor</source>
-        <translation>Vendedor</translation>
+        <translation>Fabricante</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
@@ -687,7 +891,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Force download of all dives</source>
-        <translation>Forçar baixar todos os mergulhos</translation>
+        <translation>Forçar recebimento de todos os mergulhos</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -707,33 +911,33 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
         <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
+        <translation>Salvar arquivo de log da biblioteca libdivecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"/>
+        <translation>Salvar arquivo de saída da biblioteca libdivecomputer</translation>
     </message>
 </context>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
-        <translation>Editar locais seleccionados</translation>
+        <translation>Editar pontos de mergulho selecionados</translation>
     </message>
 </context>
 <context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -745,7 +949,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
-        <translation>Instrutor de Mergulho</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="155"/>
@@ -755,22 +959,24 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Start time</source>
-        <translation>hora de início</translation>
+        <translation>Horário de início</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
-        <translation>Temp do Ar</translation>
+        <translation>Temp ambiente</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>Temp da água</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Tags</source>
-        <translation>Etiquetas</translation>
+        <translation>Rótulos</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="192"/>
@@ -789,7 +995,7 @@ Por favor, remova-os primeiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -816,7 +1022,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="433"/>
         <source>Gases Used</source>
-        <translation>Gás utilizado</translation>
+        <translation>Gases utilizados</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="452"/>
@@ -827,7 +1033,7 @@ Por favor, remova-os primeiro</translation>
         <location filename="../qt-ui/maintab.ui" line="471"/>
         <location filename="../qt-ui/maintab.ui" line="729"/>
         <source>SAC</source>
-        <translation>Consumo</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="490"/>
@@ -852,7 +1058,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="566"/>
         <source>Air Temperature</source>
-        <translation>Temperatura do Ar</translation>
+        <translation>Temperatura ambiente</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="585"/>
@@ -900,92 +1106,102 @@ Por favor, remova-os primeiro</translation>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Cilindros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
-        <translation>Adicionar garrafa</translation>
+        <translation>Adicionar cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Local da viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
-        <translation>Esta viagem está a ser editada.</translation>
+        <translation>Esta viagem está sendo editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
-        <translation>Estão a ser editados vários mergulhos.</translation>
+        <translation>Vários mergulhos estão sendo editados.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
-        <translation>Este mergulho está a ser editado.</translation>
+        <translation>Este mergulho está sendo editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -993,427 +1209,517 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
-        <translation>&amp;Ficheiro</translation>
+        <translation>A&amp;rquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Salvar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importar arquivos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportar %UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>%Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
-        <translation>Importar do %computador de mergulho</translation>
+        <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation>Importar &amp;GPS de serviço Subsurface</translation>
+        <translation>Importar informações &amp;GPS do serviço Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>%Editar nomes dos dispositivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Ligar/desligar &amp;Zoom</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Lista de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
-        <translation>&amp;Manual do utilizador</translation>
+        <translation>&amp;Manual do usuário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
-        <translation>P&amp;lanear mergulho</translation>
+        <translation>P&amp;lanejar mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importar CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importar CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importar de Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Adicionar mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
-        <translation>Auto agrupar</translation>
+        <translation>Agrupar automaticamente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Computador de mergulho anterior</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Computador de mergulho seguinte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Selecionar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Introduzir Plano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
-        <translation>Por favor, salve ou cancele o mergulho atual antes de fechar o arquivo.</translation>
+        <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Por favor, salve ou cancele o mergulho atual antes de planejar um mergulho.</translation>
+        <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
-        <translation>Por favor, salve ou cancele o mergulho atual antes de tentar asicionar um mergulho.</translation>
+        <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="503"/>
-        <source>User Manual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Não foi possível encontrar o manual do Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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>
+        <translation>Deseja gravar as alterações feitas no arquivo %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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>
+        <translation>Deseja gravar as alterações feitas no arquivo de dados?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Salvar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Primeiro termine a edição atual antes de editar outro.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Salvar aquivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Por favor, salve ou cancele o mergulho atual antes de abrir um novo arquivo.</translation>
+        <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
+        <translation>Arquivos UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
+        <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1436,7 +1742,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="115"/>
         <source>Language</source>
-        <translation type="unfinished"/>
+        <translation>Língua</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="141"/>
@@ -1461,7 +1767,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="176"/>
         <source>Default Dive file</source>
-        <translation>Ficheiro de mergulhos padrão</translation>
+        <translation>Arquivo padrão de mergulhos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="188"/>
@@ -1476,217 +1782,195 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
-        <translation>Garrafa padrão</translation>
+        <translation>Cilindro padrão</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="220"/>
         <source>Use Default Cylinder</source>
-        <translation>Usar a Garrafa padrão</translation>
+        <translation>Usar cilindro padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
-        <translation type="unfinished"/>
+        <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
-        <translation type="unfinished"/>
+        <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
-        <translation type="unfinished"/>
+        <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
-        <translation type="unfinished"/>
+        <translation>pé cúbico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
-        <translation type="unfinished"/>
+        <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
-        <translation type="unfinished"/>
+        <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
-        <translation type="unfinished"/>
+        <translation>Padrão do Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Unidades de tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Denominador da velocidade de subida/descida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>limite</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Tecto reportado pelo computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>pintar o tecto de vermelho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Tecto calculado</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>mostrar todos os tecidos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>incrementos de 3 m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Calcular NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
@@ -1696,60 +1980,55 @@ Por favor, remova-os primeiro</translation>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
-        <translation type="unfinished"/>
+        <translation>Reinicialização necessária</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation type="unfinished"/>
+        <translation>Para carregar corretamente uma nova língua você deve reiniciar o Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Abrir o logbook padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
+        <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Prévisualizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
-        <translation type="unfinished"/>
+        <translation>Imp&amp;rimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>Fe&amp;char</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -1759,7 +2038,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Dive#</source>
-        <translation>Mergulho#</translation>
+        <translation>Mergulho nº</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
@@ -1779,7 +2058,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
-        <translation>Padrão</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
@@ -1797,7 +2076,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
-        <translation>Imprimir opções</translation>
+        <translation>Opções de impressão</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
@@ -1807,7 +2086,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
-        <translation>Imprimir colorido</translation>
+        <translation>Imprimir em cores</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="86"/>
@@ -1827,12 +2106,12 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
-        <translation>Imprimir tabela</translation>
+        <translation>Tabela</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
-        <translation>Ordenando</translation>
+        <translation>Ordenação</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="180"/>
@@ -1847,7 +2126,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation>Configurar alturas (% da janela)</translation>
+        <translation>Configurar alturas (% do layout)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="256"/>
@@ -1857,7 +2136,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation>Altura dos restantes dados (8% - 17%)</translation>
+        <translation>Altura dos outros dados (8% - 17%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="338"/>
@@ -1872,216 +2151,116 @@ Por favor, remova-os primeiro</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Adicionar troca de gás</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Adicionar marcador</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Remover evento</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Esconder eventos semelhantes</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Ocultar eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Esconder todos os %1 eventos?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Remover o evento seleccionado?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>computador de mergulho desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Duração prevista: 10 minutos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Escala</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Régua</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Medir propriedades dos segmentos do mergulho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Redimensionar o mergulho ao tamanho do ecrã</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Editar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>ar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Troca de emergência para circuito aberto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>início</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>fim</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Profundidade máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
-        <translation>Consumo:</translation>
+        <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>CNS máximo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
-        <translation>Guia:</translation>
+        <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
-        <translation>Fato:</translation>
+        <translation>Roupa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Adicionar troca de gás</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Adicionar favorito</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Remover evento</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Esconder eventos semelhantes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Mostrar todos os eventos</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Remover este ponto</translation>
     </message>
@@ -2091,24 +2270,24 @@ Por favor, remova-os primeiro</translation>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <translation>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation>
     </message>
 </context>
 <context>
@@ -2124,17 +2303,70 @@ Por favor, remova-os primeiro</translation>
         <translation>Novo número inicial</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Deslocar os tempos selecionados</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>mais cedo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>mais tarde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="20"/>
         <source>Shift selected times</source>
-        <translation>Deslocar os tempos seleccionados</translation>
+        <translation>Deslocar os tempos selecionados</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="37"/>
         <source>Shift times of selected dives by</source>
-        <translation>Deslocar os tempos dos mergulhos seleccionados em</translation>
+        <translation>Deslocar os tempos dos mergulhos selecionados em</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="73"/>
@@ -2160,19 +2392,24 @@ Por favor, remova-os primeiro</translation>
         <translation>Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&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, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Licença</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
-        <translation>%Website</translation>
+        <translation>Sítio &amp;Web</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Fe&amp;char</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
     </message>
 </context>
 <context>
@@ -2183,37 +2420,37 @@ Por favor, remova-os primeiro</translation>
         <translation>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation>Recebimento finalizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Erro no recebimento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Erro de conexão:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
-        <translation>Identificação de utilizador inválida !</translation>
+        <translation>Identificador de usuário inválido!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
-        <translation>Não é possível analisar a resposta !</translation>
+        <translation>Não é possível analisar a resposta!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Operação de transferência bem sucedida!</translation>
     </message>
@@ -2223,23 +2460,23 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="23"/>
         <source>Add Cylinder</source>
-        <translation>Adicionar garrafa</translation>
+        <translation>Adicionar cilindro</translation>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2247,20 +2484,33 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Manual do Usuário</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Não foi possível encontrar o manual do Subsurface</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2270,163 +2520,163 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Conexão ao serviço web</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
         <source>Status:</source>
-        <translation>Estado:</translation>
+        <translation>Situação:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
         <source>Enter your ID here</source>
-        <translation>Inserir a sua ID aqui</translation>
+        <translation>Inserir o seu ID aqui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
-        <translation>Descarregar</translation>
+        <translation>Receber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
-        <translation>ID do utilizador</translation>
+        <translation>ID do usuário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
-        <translation>Carregar</translation>
+        <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
-        <translation type="unfinished"/>
+        <translation>Tempo limite para operação estourou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
-        <translation type="unfinished"/>
+        <translation>Transferindo dados...</translation>
     </message>
 </context>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation>Ao clicar aqui irá remover este sistema de lastro</translation>
+        <translation>Ao clicar aqui irá remover este sistema de lastro.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
-&gt;Mês / Viagem</translation>
+&gt; Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
-        <translation>#</translation>
+        <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
-        <translation>Consumo (%1)
+        <translation>SAC (%1)
 Médio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2442,25 +2692,25 @@ Médio</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
@@ -2476,7 +2726,7 @@ Médio</translation>
         <location filename="../qt-gui.cpp" line="235"/>
         <location filename="../qt-gui.cpp" line="249"/>
         <source>ft</source>
-        <translation>ft</translation>
+        <translation>pé(s)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
@@ -2493,17 +2743,17 @@ Médio</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
@@ -2535,22 +2785,18 @@ Médio</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Não foi possível ler &apos;%s&apos;. Use importar para ficheiros CSV.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation>
+        <translation>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
@@ -2560,7 +2806,7 @@ Médio</translation>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>deco stop</source>
-        <translation>paragem de deco</translation>
+        <translation>parada de deco</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
@@ -2575,12 +2821,12 @@ Médio</translation>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>ceiling</source>
-        <translation>tecto</translation>
+        <translation>teto</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>workload</source>
-        <translation>esforço</translation>
+        <translation>nível de esforço</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
@@ -2590,7 +2836,7 @@ Médio</translation>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>violation</source>
-        <translation>transgressão</translation>
+        <translation>violação</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
@@ -2616,22 +2862,22 @@ Médio</translation>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>safety stop (voluntary)</source>
-        <translation>paragem de segurança (voluntária)</translation>
+        <translation>parada de segurança (voluntária)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>safety stop (mandatory)</source>
-        <translation>paragem de segurança (obrigatória)</translation>
+        <translation>parada de segurança (obrigatória)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>deepstop</source>
-        <translation>paragem funda</translation>
+        <translation>parada profunda</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>ceiling (safety stop)</source>
-        <translation>tecto (paragem de segurança)</translation>
+        <translation>teto (parada de segurança)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
@@ -2647,7 +2893,7 @@ Médio</translation>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>maxdepth</source>
-        <translation>Profundidade Máx</translation>
+        <translation>prof máx</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
@@ -2672,7 +2918,7 @@ Médio</translation>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>heading</source>
-        <translation>cabeçalho</translation>
+        <translation>direção</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="144"/>
@@ -2682,447 +2928,460 @@ Médio</translation>
     <message>
         <location filename="../libdivecomputer.c" line="144"/>
         <source>non stop time</source>
-        <translation>tempo sem paragem</translation>
+        <translation>tempo sem parada</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="161"/>
         <source>invalid event number</source>
-        <translation>numero de evento inválido</translation>
+        <translation>número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <source>Unable to create parser for %s %s</source>
-        <translation>Não é possivel criar o &quot;parser&quot; para %s %s</translation>
+        <translation>Não é possivel criar o analisador para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
-        <translation>Erro no registo de dados</translation>
+        <translation>Erro no registo dos dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
-        <translation>Erro na análise da data/tempo</translation>
+        <translation>Erro na análise da data/horário</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="433"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation>Mergulho #%d:%s %d %04d</translation>
+        <translation>Mergulho nº %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="438"/>
         <source>Error parsing the divetime</source>
-        <translation>Erro na análise do tempo de mergulho</translation>
+        <translation>Erro na análise da duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
-        <translation>Erro na análise na contagem da mistura de gás</translation>
+        <translation>Erro na análise da contagem de misturas de gases</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
-        <translation>Erro na obtenção da pressão atmosférica</translation>
+        <translation>Erro na obtenção da pressão na superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <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="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
-        <translation>Evento: à espera de acção do utilizador</translation>
+        <translation>Evento: aguardando ação do usuário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
-        <translation>Erro no registo do &quot;event handler&quot;.</translation>
+        <translation>Erro no registo do rótulo do evento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
-        <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
+        <translation>Erro no registo do rótulo de cancelamento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
-        <translation>Erro a importar os dados do mergulho</translation>
+        <translation>Erro ao importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation>Não é possivel criar contexto do libdivecomputer</translation>
+        <translation>Não é possivel criar contexto da libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
-        <translation>Leitura estranha das percentagens %s
+        <translation>Percentagem estranha na leitura %s
 
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Falha na análise de &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
-        <translation>A consulta &quot;obter eventos&quot; falhou.
+        <translation>A consulta &quot;get_events&quot; falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
-        <source>Database connection failed '%s'.
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
 </source>
-        <translation>Falha na ligação à base de dados &apos;%s&apos;
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="1857"/>
-        <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="1917"/>
-        <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../file.c" line="176"/>
+        <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="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
+        <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="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <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="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation>Não é possível encontrar o gás %d/%d</translation>
+        <translation>Não é possível localizar o gás %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
-        <translation>Demasiadas misturas de gás</translation>
+        <translation>Misturas de gás em excesso</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
         <translation>%s
-Plano de Mergulho Subsurface
+Plano de mergulho do Subsurface
 baseado em GFlow = %.0f e GFhigh = %.0f
 
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>Troca para %.*f %s em %d:%02d min - runtime %d:%02u em %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Mudar para a mistura %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Consumo de gás:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Tecto calculado %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Tecido %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Paragem de segurança:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-Consumo:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Paragem de segurança: tempo desconhecido @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco:tempo desconhecido @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-Em descompressão</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-PEA:%d%s
-PNE:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Descompressão:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-Em descompressão (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
@@ -3139,7 +3398,7 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation>drift</translation>
+        <translation>correnteza</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
@@ -3149,7 +3408,7 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation>caverna</translation>
+        <translation>gruta (com luz natural)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
@@ -3189,7 +3448,7 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation>noite</translation>
+        <translation>noturno</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
@@ -3222,142 +3481,142 @@ TTS:%umin (calc)</translation>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>mais que %d dias</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
-        <translation>para mergulhos #</translation>
+        <translation>para mergulhos nº</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
-        <translation>para mergulhos seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../statistics.c" line="275"/>
-        <source>for dive #%d</source>
-        <translation>para mergulho #%d</translation>
+        <translation>para mergulhos selecionados</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="277"/>
-        <source>for selected dive</source>
-        <translation>para mergulho seleccionado</translation>
+        <source>for dive #%d</source>
+        <translation>para mergulho nº %d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="279"/>
+        <source>for selected dive</source>
+        <translation>para mergulho selecionado</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3366,8 +3625,8 @@ TTS:%umin (calc)</translation>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation>Uemis Zurich: O sistema de ficheiros está quase cheio
-Desligue / ligue novamente o computador de mergulho
+        <translation>Uemis Zurich: O sistema de arquivos está quase cheio
+Desconecte e reconecte novamente o computador de mergulho
 e clique em &quot;Repetir&quot;</translation>
     </message>
     <message>
@@ -3375,201 +3634,201 @@ e clique em &quot;Repetir&quot;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation>Uemis Zurich: sistema de ficheiros está cheio
-Desligue / ligue o computador de mergulho
+        <translation>Uemis Zurich: Sistema de arquivos está cheio
+Desconecte e reconecte o computador de mergulho
 e tente novamente</translation>
     </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>Escrita curta do ficheiro req.txt.
-O Uemis Zurich está bem ligado?</translation>
+        <translation>Escrita curta no arquivo req.txt.
+O Uemis Zurich está conectado corretamente?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Lendo %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
-        <translation>data</translation>
+        <translation>dados</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
-        <translation>identificador no diário de mergulho</translation>
+        <translation>identificador de registro no diário de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
-        <translation>identificação do local de mergulho</translation>
+        <translation>identificação dos dados do local de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
-        <translation>mais dados do identificador de mergulho</translation>
+        <translation>mais informações sobre identificador de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
-        <translation>roupa seca</translation>
+        <translation>roupa úmida</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semi-seca</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>roupa seca</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>short</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>casaco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
-        <translation>long john</translation>
+        <translation>macacão</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>colete</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
-        <translation>fato completo</translation>
+        <translation>roupa completa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
-        <translation>Fato completo 2 peças</translation>
+        <translation>Roupa completa 2 peças</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Iniciar Comunicação</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
-        <translation>Iniciar download</translation>
-    </message>
-    <message>
-        <location filename="../uemis.c" line="194"/>
-        <source>Safety Stop Violation</source>
-        <translation>Transgressão na paragem de segurança</translation>
+        <translation>Iniciar recebimento</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
+        <source>Safety Stop Violation</source>
+        <translation>Violação da parada de segurança</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarme de velocidade</translation>
     </message>
-    <message>
-        <location filename="../uemis.c" line="199"/>
-        <source>Speed Warning</source>
-        <translation>Aviso de velocidade</translation>
-    </message>
     <message>
         <location filename="../uemis.c" line="201"/>
-        <source>PO2 Green Warning</source>
-        <translation>Aviso Verde PpO2</translation>
+        <source>Speed Warning</source>
+        <translation>Alerta de velocidade</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Aviso de subida PpO2</translation>
+        <location filename="../uemis.c" line="203"/>
+        <source>PO2 Green Warning</source>
+        <translation>Alerta verde de PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarme de Subida PpO2</translation>
+        <source>PO2 Ascend Warning</source>
+        <translation>Alerta de subida de PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
-        <source>Tank Pressure Info</source>
-        <translation>Informação da pressão da garrafa</translation>
+        <location filename="../uemis.c" line="208"/>
+        <source>PO2 Ascend Alarm</source>
+        <translation>Alarme de subida da PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
-        <source>RGT Warning</source>
-        <translation>Aviso tempo de gás restante</translation>
+        <source>Tank Pressure Info</source>
+        <translation>Informação da pressão do cilindro</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
+        <source>RGT Warning</source>
+        <translation>Aviso de tempo de gás restante</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alerta de tempo de gás restante</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
-        <translation>Sugestão de troca de garrafa</translation>
+        <translation>Sugestão de troca de cilindro</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Limite de profundidade excedido</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Aviso de tempo de descompressão máximo</translation>
     </message>
-    <message>
-        <location filename="../uemis.c" line="222"/>
-        <source>Dive Time Info</source>
-        <translation>Info de tempo de mergulho</translation>
-    </message>
     <message>
         <location filename="../uemis.c" line="224"/>
-        <source>Dive Time Alert</source>
-        <translation>Alerta de tempo de mergulho</translation>
+        <source>Dive Time Info</source>
+        <translation>Info de duração do mergulho</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
+        <source>Dive Time Alert</source>
+        <translation>Alerta de duração do mergulho</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Marcador</translation>
     </message>
-    <message>
-        <location filename="../uemis.c" line="228"/>
-        <source>No Tank Data</source>
-        <translation>Sem dados registados da garrafa</translation>
-    </message>
     <message>
         <location filename="../uemis.c" line="230"/>
-        <source>Low Battery Warning</source>
-        <translation>Aviso de nível de bateria</translation>
+        <source>No Tank Data</source>
+        <translation>Sem dados registrados do cilindro</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
+        <source>Low Battery Warning</source>
+        <translation>Aviso de nível de bateria baixo</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
-        <translation>Alerta de nível de bateria</translation>
+        <translation>Alerta de nível de bateria baixo</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index 28c7610e2..e146219ff 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -1,151 +1,73 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importar ficheiro (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Separador de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Configuração de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importar ficheiro CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Tempo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Profundidade</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Profundidade da paragem</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Importar pré-definições </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Abrir ficheiro CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>Ficheiros CSV (*.csv);;Todos os ficheiros(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Trocar aos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>A garrafa não pode ser eliminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
         <translation>pés^3</translation>
     </message>
@@ -173,35 +95,78 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>ar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <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="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>iniciar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>ar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>pés cúbicos/min</translation>
     </message>
@@ -209,101 +174,260 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Mostrar caixa de busca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>colapsar outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>criar nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>juntar viagem com a viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>juntar viagem com a viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>gravar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>mudar os tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation>carregar imagens</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>exportar mergulho(s) para divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Gravar mergulhos como...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Gravar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation>Abrir ficheiros de imagens</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <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="730"/>
         <source>merge selected dives</source>
         <translation>juntar os mergulhos seleccionados</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Separador de campos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Configuração de campos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Profundidade</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Profundidade da paragem</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Tempo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Unidades</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <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"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation>Mergulhos manuais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation>Mergulho #</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation>Prof. Max.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation>Profundidade média</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Companheiros</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10 m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30 pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Erro na posição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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.
@@ -370,37 +494,37 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Eliminar o plano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Está prestes a eliminar o plano.</translation>
     </message>
@@ -408,85 +532,158 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Pontos do plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Gases disponíveis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>adicionar ponto ao mergulho</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>data</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>pés</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation>Côr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation>Inserido pelo utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>libras</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation>Lista de garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>fato</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation>Pressão S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>garrafa</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation>Pressão I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>local</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation>Tecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation>PN2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>PHE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>data</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>pés</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>libras</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>fato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>garrafa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>local</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>Consumo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>CNS máx</translation>
     </message>
@@ -494,115 +691,115 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Resposta inválida do servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>não foram seleccionados nenhuns mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>falha na criação do ficheiro zip para upload: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>não foi possível criar o ficheiro temporário: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>erro interno: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Concluído</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>A carregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>A descarregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>A descarregar %1 mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Descarga terminada - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Exportação falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Exportação bem sucedida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>O login falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Não foi possível analisar a resposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Carregamento terminado</translation>
     </message>
@@ -610,48 +807,54 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Repetir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Procurar computador de mergulho Uemis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Ficheiros log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
-        <translation>Gravar a descarga do libdivecomputer não vai descarregar os mergulhos para a lista</translation>
+        <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Ficheiros dump (*.bin)</translation>
     </message>
@@ -713,13 +916,13 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation>Gravar ficheiro de descarga do libdivecomputer</translation>
+        <translation>Gravar ficheiro em bruto do libdivecomputer</translation>
     </message>
 </context>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Editar locais seleccionados</translation>
     </message>
@@ -728,13 +931,13 @@ 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="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -760,11 +963,13 @@ Por favor, remova-os primeiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Temperatura da água</translation>
     </message>
@@ -790,7 +995,7 @@ Por favor, remova-os primeiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -901,92 +1106,102 @@ Por favor, remova-os primeiro</translation>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Local da viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Esta viagem está a ser editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <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="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Este mergulho está a ser editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -994,428 +1209,518 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Guardar como...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importar ficheiros</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportar &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation>Mostrar EAD, END e EADD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation>Importar &amp;GPS de serviço Subsurface</translation>
+        <translation>Importar &amp;GPS do serviço Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Editar nomes dos computadores</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Ligar/desligar &amp;Zoom</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Lista de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manual do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Globo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanear mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importar CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importar CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Importar a partir de Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation>Mostrar MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <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"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation>Mostrar tecto calculado</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <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"/>
+        <source>Calculate All Tissues</source>
+        <translation>Calcular para todos os tecidos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation>Mostrar taxa de consumo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation>Mostrar / Esconder régua</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Adicionar mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Agrupar automaticamente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Computador de mergulho anterior</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Computador de mergulho seguinte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Seleccionar Eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Introduzir Plano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation>Importar logbooks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importar logbooks de outros programas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation>&amp;Ecrã completo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation>Ligar ecrã completo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Manual do utilizador</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Não foi possível encontrar o manual do Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Guardar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Termine de editar este mergulho antes de editar um outro.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Gravar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Estatísticas anuais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation>Abrir logbook</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <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>PreferencesDialog</name>
@@ -1462,7 +1767,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="176"/>
         <source>Default Dive file</source>
-        <translation>Ficheiro de mergulhos padrão</translation>
+        <translation>Logbook por defeito</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="188"/>
@@ -1482,212 +1787,190 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="220"/>
         <source>Use Default Cylinder</source>
-        <translation>Usar a Garrafa padrão</translation>
+        <translation>Usar a garrafa padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation>limite quando mostrar pO2</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation>limite quando mostrar pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation>limite quando mostrar pHe</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation>ppO2 máxima quando mostrar MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation>desenhar o tecto reportado pelo computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation>garrafas não usadas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Linguagem do sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Unidades de tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Denominador da velocidade de subida/descida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>limite</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>ppO₂ máxima</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Tecto reportado pelo computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>pintar o tecto de vermelho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Tecto calculado</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>mostrar todos os tecidos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>incrementos de 3 m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Calcular NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
@@ -1697,37 +1980,32 @@ Por favor, remova-os primeiro</translation>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>Consumo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>É necessário reiniciar a aplicação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Abrir o logbook padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>%Previsão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Im&amp;primir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -1873,216 +2151,116 @@ Por favor, remova-os primeiro</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Adicionar troca de gás</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Adicionar marcador</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Remover evento</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Esconder eventos semelhantes</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Mostrar todos os eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Esconder eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Esconder todos os %1 eventos?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Remover o evento seleccionado?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>computador de mergulho desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Duração prevista: 10 minutos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Escala</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Régua</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Medir propriedades dos segmentos do mergulho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Redimensionar o mergulho ao tamanho do ecrã</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Editar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>ar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Troca de emergência para circuito aberto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>iniciar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>fim</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Prof. Máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>CNS máximo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Adicionar troca de gás</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Adicionar marcador</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Remover evento</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Esconder eventos semelhantes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Mostrar todos os eventos</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Remover este ponto</translation>
     </message>
@@ -2092,22 +2270,22 @@ Por favor, remova-os primeiro</translation>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <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>
@@ -2125,6 +2303,59 @@ Por favor, remova-os primeiro</translation>
         <translation>Novo número inicial</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Deslocar os tempos seleccionados</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation>Alterar horas da(s) imagem(ns) em</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>mais cedo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>mais tarde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <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="155"/>
+        <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="193"/>
+        <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="181"/>
+        <source>Open Image File</source>
+        <translation>Abrir imagem</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Por favor, remova-os primeiro</translation>
         <translation>Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&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, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Licença</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>%Website</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Fechar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Aplicação multi-plataforma para registo de mergulhos&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, e outros, 2011-2014&lt;/span&gt;</translation>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Por favor, remova-os primeiro</translation>
         <translation>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Ligar ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Descarga terminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Erro na descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Erro de ligação:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Identificação de utilizador inválida !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Não é possível analisar a resposta !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Operação de transferência bem sucedida!</translation>
     </message>
@@ -2230,17 +2466,17 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Manual do utilizador</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Não foi possível encontrar o manual do Subsurface</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ Por favor, remova-os primeiro</translation>
         <translation>Inserir a sua ID aqui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Descarregar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>ID do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Palavra-passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Carregar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>A operação demorou demasiado tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>A transferir dados...</translation>
     </message>
@@ -2317,37 +2566,37 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2355,79 +2604,79 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt;Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>Consumo (%1)
 Médio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -2443,25 +2692,25 @@ Média</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
@@ -2494,17 +2743,17 @@ Média</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
@@ -2536,20 +2785,16 @@ Média</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Não foi possível ler &apos;%s&apos;. Use importar para ficheiros CSV.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation>
     </message>
@@ -2691,17 +2936,17 @@ Média</translation>
         <translation>Número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Erro no registo de dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/tempo</translation>
     </message>
@@ -2716,72 +2961,72 @@ Média</translation>
         <translation>Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <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="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Erro a importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Leitura estranha das percentagens %s
@@ -2789,61 +3034,90 @@ Média</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Falha na análise de &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>A consulta &quot;obter eventos&quot; falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation>Falha no query get_tags à base de dados.
+</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <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="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <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="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <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="2004"/>
+        <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="2011"/>
+        <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="2102"/>
         <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="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Não é possível encontrar o gás %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas misturas de gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2856,274 +3130,290 @@ baseado em GFlow = %.0f  e  GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Alterar gás para %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Consumo de gás:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Tecto calculado %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Tecido %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Paragem de segurança:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-Consumo:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Paragem de segurança: tempo desconhecido @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco: Duração desconhecida @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-Em descompressão</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation>@: %d:%02d
+D: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation>P: %d%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation>T: %.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation>V: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation>SAC: %2.1fl/min
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-PEA:%d%s
-PNE:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation>CNS: %u%%
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Descompressão:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation>pO%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-Em descompressão (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation>pN%s: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation>pHe: %.2fbar
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation>MOD: %d%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation>Paragem de segurança: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation>Paragem de segurança: tempo desconhecido @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation>Descompressão: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation>Descompressão: tempo desconhecido @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation>Em descompressão
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation>NDL: %umin
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation>Descompressão:  %umin @ %.0f%s (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation>Em descompressão (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation>NDL: %umin (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation>TTS: %umin (calc)
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation>Tecto calculado %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation>Tecido  %.0fmin: %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation>frequência cardíaca: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation>enfiamento: %d
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
@@ -3223,142 +3513,142 @@ TTS:%umin (calc)</translation>
         <translation>descompressão</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>mais de %d dias</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>para mergulhos #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>para mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>para mergulho #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>para mergulho seleccionado</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3388,187 +3678,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 O Uemis Zurich está bem ligado?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>A ler %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>dados</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>identificador no diário de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>identificação do local de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>mais dados do identificador de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>fato húmido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semi-seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>fato seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>short</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>casaco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>colete</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>fato completo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>Fato completo 2 peças</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Iniciar Comunicação</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Começar transferência</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Transgressão na paragem de segurança</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarme de Velocidade</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Alarme de velocidade</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Aviso Verde PpO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Aviso de subida PpO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarme de Subida PpO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Informação da pressão da garrafa</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Aviso tempo de gás restante</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alerta de tempo de gás restante</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Sugestão de troca de garrafa</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Limite de profundidade ultrapassado</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Aviso de tempo de descompressão máximo</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Informação sobre a duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alerta de duração de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Marcador</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Sem dados registados da garrafa</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Aviso de Bateria Baixa</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alerta de Bateria Baixa</translation>
     </message>
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
new file mode 100644
index 000000000..afd42ccde
--- /dev/null
+++ b/translations/subsurface_ro_RO.ts
@@ -0,0 +1,3833 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0">
+<context>
+    <name>CylindersModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Type</source>
+        <translation>Tip</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Size</source>
+        <translation>Mărime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>WorkPress</source>
+        <translation>Pres. Nom.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>StartPress</source>
+        <translation>Pres. Start</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>EndPress</source>
+        <translation>Pres. Sfârșit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>O</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <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="341"/>
+        <source>Cylinder cannot be removed</source>
+        <translation>Tubul nu poate fi înlăturat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="342"/>
+        <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="488"/>
+        <source>psi</source>
+        <translation>livre pe inch pătrat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="489"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="512"/>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="513"/>
+        <source>cuft</source>
+        <translation>picioare cubice</translation>
+    </message>
+</context>
+<context>
+    <name>DiveComputerManagementDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
+        <source>Edit Dive Computer Nicknames</source>
+        <translation>Editează Aliasul Computerului de Scufundări</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="45"/>
+        <source>Remove the selected Dive Computer?</source>
+        <translation>Înlăturați Computerul de Scufundări selectat?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
+        <source>Are you sure that you want to 
+ remove the selected dive computer?</source>
+        <translation>Sunteți sigur că vreți să înlăturați 
+computerul de scufundări selectat?</translation>
+    </message>
+</context>
+<context>
+    <name>DiveComputerModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Model</source>
+        <translation>Model</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Device ID</source>
+        <translation>ID-ul dispozitivului</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Nickname</source>
+        <translation>Alias</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
+        <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>
+</context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>aer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>început</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>aer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
+<context>
+    <name>DiveItem</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
+        <source> l/min</source>
+        <translation>l/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source> cuft/min</source>
+        <translation>picioare cubice/min</translation>
+    </message>
+</context>
+<context>
+    <name>DiveListView</name>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
+        <source>Show Search Box</source>
+        <translation>Arată Căsuța de Căutare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <source>expand all</source>
+        <translation>extinde tot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <source>collapse all</source>
+        <translation>restrânge tot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <source>collapse others</source>
+        <translation>restrânge-le pe celelalte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <source>remove dive(s) from trip</source>
+        <translation>șterge scufundarea (ările) din excursie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <source>create new trip above</source>
+        <translation>creează o nouă excursie deasupra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
+        <source>add dive(s) to trip immediately above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <source>merge trip with trip above</source>
+        <translation>îmbină excursia cu excursia de deasupra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
+        <source>merge trip with trip below</source>
+        <translation>îmbină excursia cu excursia de dedesupt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
+        <source>delete dive(s)</source>
+        <translation>șterge scufundarea (ările)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <source>mark dive(s) invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <source>save As</source>
+        <translation>salvează ca</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <source>export As UDDF</source>
+        <translation>exportă ca UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
+        <source>shift times</source>
+        <translation>mută timpurile</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
+        <source>upload dive(s) to divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
+        <source>Save Dives As...</source>
+        <translation>Salvează Scufundările ca...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
+        <source>Save File as</source>
+        <translation>Salvează Fișierul ca</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Fișiere UDDF (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
+        <source>merge selected dives</source>
+        <translation>îmbină scufundările selectate</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Separator de Câmpuri</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Configurația Câmpurilor</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Adâncime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Timp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <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"/>
+        <source>Metric</source>
+        <translation>Metric</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Dată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Locație</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Companion</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
+    </message>
+</context>
+<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>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 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"/>
+        <source>ATM Pressure</source>
+        <translation>Presiune ATM</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
+        <source>10m</source>
+        <translation>10m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
+        <source>30ft</source>
+        <translation>30 de picioare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
+        <source>Handler Position Error</source>
+        <translation>Eroare cauzată de Handlerul Poziției</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
+        <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>
+    </message>
+</context>
+<context>
+    <name>DivePlannerPointsModel</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
+        <source>AIR</source>
+        <translation>AER</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
+        <source>Final Depth</source>
+        <translation>Adâncime Finală</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
+        <source>Used Gas</source>
+        <translation>Gaz Folosit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
+        <source>CC Set Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
+        <source>Discard the Plan?</source>
+        <translation>Înlăturați Planul?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
+        <source>You are about to discard your plan.</source>
+        <translation>Sunteți pe cale de a șterge planul.</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
+        <source>Dive Planner Points</source>
+        <translation>Puncte Planificator Scufundări</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
+        <source>Available Gases</source>
+        <translation>Gaze Disponibile</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation>adaugă punct de date pentru scufundare</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Adâncime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Timp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Presiune</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatură</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>data</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>picioare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>livre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>costum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>tub</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>locația</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>maxCNS</source>
+        <translation>maxCNS</translation>
+    </message>
+</context>
+<context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
+        <source>Invalid response from server</source>
+        <translation>Răspuns invalid de la server</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
+        <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="552"/>
+        <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="559"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
+        <source>no dives were selected</source>
+        <translation>nu a fost selectată nicio scufundare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
+        <source>failed to create zip file for upload: %1</source>
+        <translation>crearea fișierului zip pentru upload a eșuat: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
+        <source>cannot create temporary file: %1</source>
+        <translation>nu s-a putut crea fișierul temporar: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
+        <source>internal error: %1</source>
+        <translation>eroare internă: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
+        <source>internal error</source>
+        <translation>eroare internă</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
+        <source>Done</source>
+        <translation>Finalizat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
+        <source>Uploading dive list...</source>
+        <translation>Se uploadează lista de scufundări...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
+        <source>Downloading dive list...</source>
+        <translation>Se descarcă lista de scufundări...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <source>Download finished - %1</source>
+        <translation>Descărcarea s-a terminat - %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <source>Corrupted download</source>
+        <translation>Descărcarea a fost coruptă.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
+        <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="821"/>
+        <source>Upload failed</source>
+        <translation>Upload-ul a eșuat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
+        <source>Upload successful</source>
+        <translation>Upload-ul a avut succes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
+        <source>Login failed</source>
+        <translation>Logarea a eșuat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
+        <source>Cannot parse response</source>
+        <translation>Nu s-a putut parsa răspunsul</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
+        <source>Error: %1</source>
+        <translation>Eroare: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <source>Upload finished</source>
+        <translation>Upload-ul a fost finalizat</translation>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDCWidget</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
+        <source>Error</source>
+        <translation>Eroare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <source>Retry</source>
+        <translation>Reîncearcă</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
+        <source>Choose file for divecomputer download logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
+        <source>Log files (*.log)</source>
+        <translation>Fișiere de log (*.log)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
+        <source>Warning</source>
+        <translation>Avertizare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
+        <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="346"/>
+        <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="347"/>
+        <source>Dump files (*.bin)</source>
+        <translation>Fișiere dump (*.bin)</translation>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDiveComputer</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <source>Download From Dive Computer</source>
+        <translation>Descarcă din Computerul de Scufundări</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <source>Vendor</source>
+        <translation>Furnizor</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <source>Dive Computer</source>
+        <translation>Computer de Scufundări</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <source>Device or Mount Point</source>
+        <translation>Dispozitiv sau Punct de Montare</translation>
+    </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>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <source>Force download of all dives</source>
+        <translation>Forțeaza descărcarea tuturor scufundărilor</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <source>Always prefer downloaded dives</source>
+        <translation>Preferă întotdeauna scufundările descărcate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <source>Cancel</source>
+        <translation>Anulează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salvați fișierul de log al libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Salvați fișierul de dump al libdivecomputer</translation>
+    </message>
+</context>
+<context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
+        <source>Edit Selected Dive Locations</source>
+        <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="444"/>
+        <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="468"/>
+        <source>Location</source>
+        <translation>Locație</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <source>Coordinates</source>
+        <translation>Coordonate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <source>Divemaster</source>
+        <translation>Maestru scufundare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <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="235"/>
+        <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="236"/>
+        <source>Water temp</source>
+        <translation>Temperatura apei</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <source>Visibility</source>
+        <translation>Vizibilitate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <source>Suit</source>
+        <translation>Costum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <source>Equipment</source>
+        <translation>Echipament</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <source>Dive Info</source>
+        <translation>Informații despre scufundare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="395"/>
+        <source>Date</source>
+        <translation>Dată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <source>Interval</source>
+        <translation>Interval</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <source>Gases Used</source>
+        <translation>Gaze Utilizate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <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"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <source>Max. Depth</source>
+        <translation>Adâncime Maximă</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <source>Ave. Depth</source>
+        <translation>Adâncime Medie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <source>Air Pressure</source>
+        <translation>Presiunea Aerului</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <source>Air Temperature</source>
+        <translation>Temperatura Aerului</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <source>Water Temperature</source>
+        <translation>Temperatura Apei</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <source>Dive Time</source>
+        <translation>Timpul Scufundării</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <source>Salinity</source>
+        <translation>Salinitate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <source>Stats</source>
+        <translation>Statistici</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <source>Depth</source>
+        <translation>Adâncime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <source>Temperature</source>
+        <translation>Temperatură</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <source>Total Time</source>
+        <translation>Timp Total</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <source>Dives</source>
+        <translation>Scufundări</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <source>Cylinders</source>
+        <translation>Tub</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <source>Add Cylinder</source>
+        <translation>Adaugă Tub</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <source>Weights</source>
+        <translation>Greutăți</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
+        <source>Add Weight System</source>
+        <translation>Adaugă Sistem de Greutăți</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
+        <source>Trip Location</source>
+        <translation>Locația Excursiei</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <source>Trip Notes</source>
+        <translation>Notițele Excursiei</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <source>Save</source>
+        <translation>Înregistrare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <source>Cancel</source>
+        <translation>Anulează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
+        <source>This dive is being edited.</source>
+        <translation>Această scufundare este editată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
+        <source>unknown</source>
+        <translation>necunoscut</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>W</source>
+        <translation>V</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <source>Filter</source>
+        <translation>Filtrează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
+        <source>&amp;File</source>
+        <translation>&amp;Fișier</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
+        <source>&amp;Log</source>
+        <translation>&amp;Log</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Ajutor</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
+        <source>&amp;Import</source>
+        <translation>&amp;Importați</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
+        <source>&amp;New logbook</source>
+        <translation>&amp;Jurnal nou</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
+        <source>New</source>
+        <translation>Nou</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
+        <source>&amp;Open logbook</source>
+        <translation>&amp;Deschide jurnal</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
+        <source>Open</source>
+        <translation>Deschide</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Salvează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
+        <source>Save</source>
+        <translation>Salvează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
+        <source>Save as</source>
+        <translation>Salvează ca</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
+        <source>Close</source>
+        <translation>Închide</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
+        <source>Export &amp;UDDF</source>
+        <translation>Exportă &amp;UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Printează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <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="724"/>
+        <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="727"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
+        <source>&amp;Edit Device Names</source>
+        <translation>&amp;Editează Numele Dispozitivului</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
+        <source>Ctrl++</source>
+        <translation>Ctr++</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renumerotează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation>&amp;Statistici Anuale</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>Dive List</source>
+        <translation>Listă de scufundări</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <source>Info</source>
+        <translation>Informații</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
+        <source>All</source>
+        <translation>Toate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
+        <source>User &amp;Manual</source>
+        <translation>&amp;Manual Utilizator</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
+        <source>Globe</source>
+        <translation>Harta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
+        <source>P&amp;lan Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
+        <source>Import from Divelogs.de</source>
+        <translation>Importă de la Divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <source>Preferences</source>
+        <translation>Preferințe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
+        <source>Add Dive</source>
+        <translation>Adaugă Scufundare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <source>Auto Group</source>
+        <translation>Grupează Automat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <source>Prev DC</source>
+        <translation>CS Anterior</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
+        <source>Left</source>
+        <translation>Stânga</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <source>Next DC</source>
+        <translation>Următorul CS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
+        <source>Right</source>
+        <translation>Dreapta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <source>Select Events</source>
+        <translation>Selectează Evenimente</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
+        <source>Input Plan</source>
+        <translation>Introduceți Plan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
+        <source>About Subsurface</source>
+        <translation>Despre Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
+        <source>Open File</source>
+        <translation>Deschide Fișier</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <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="276"/>
+        <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="342"/>
+        <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="564"/>
+        <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="566"/>
+        <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="571"/>
+        <source>Save Changes?</source>
+        <translation>Salvați Modificările?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
+        <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="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
+        <source>Save File as</source>
+        <translation>Salvează Fișierul ca</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
+        <source>Warning</source>
+        <translation>Avertizare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <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="248"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Fișiere UDDF (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
+        <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <source>Defaults</source>
+        <translation>Implicite</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <source>Units</source>
+        <translation>Unități</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <source>Graph</source>
+        <translation>Grafic</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation>Limba</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <source>Lists and Tables</source>
+        <translation>Liste și Tabele</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <source>Font size</source>
+        <translation>Mărimea fontului</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <source>Dives</source>
+        <translation>Scufundări</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="176"/>
+        <source>Default Dive file</source>
+        <translation>Fișier de Scufundări Implicit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <source>Display Invalid</source>
+        <translation>Afișaj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <source>Default Cylinder</source>
+        <translation>Tub implicit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="220"/>
+        <source>Use Default Cylinder</source>
+        <translation>Folosește Tubul Implicit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
+        <source>System</source>
+        <translation>Sistem</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <source>Metric</source>
+        <translation>Metric</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <source>Personalize</source>
+        <translation>Personalizați</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <source>Depth</source>
+        <translation>Adâncime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
+        <source>meter</source>
+        <translation>metru</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <source>feet</source>
+        <translation>picioare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <source>psi</source>
+        <translation>livre pe inch pătrat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <source>liter</source>
+        <translation>litru</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <source>cu ft</source>
+        <translation>picioare cubice</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <source>celsius</source>
+        <translation>Celsius</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <source>fahrenheit</source>
+        <translation>Fahrenheit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Filter</source>
+        <translation>Filtrează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <source>Pressure</source>
+        <translation>Presiune</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <source>Volume</source>
+        <translation>Volum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <source>Temperature</source>
+        <translation>Temperatură</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <source>lbs</source>
+        <translation>livre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
+        <source>Time units</source>
+        <translation>Unități de timp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
+        <source>Ascent/Descent speed denominator</source>
+        <translation>Numitorul vitezei de ascensiune/coborâre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
+        <source>Minutes</source>
+        <translation>Minute</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
+        <source>Seconds</source>
+        <translation>Secunde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
+        <source>Show</source>
+        <translation>Arată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow la adâncimea maximă</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
+        <source>Misc</source>
+        <translation>Diverse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Preferințe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
+        <source>Restart required</source>
+        <translation>Este necesară o repornire</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
+        <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="328"/>
+        <source>Open Default Log File</source>
+        <translation>Deschide Fișierul de Log Implicit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Închide</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
+        <source>Print</source>
+        <translation>Printează</translation>
+    </message>
+</context>
+<context>
+    <name>PrintLayout</name>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <source>Dive#</source>
+        <translation>Scufundarea nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <source>Date</source>
+        <translation>Dată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <source>Depth</source>
+        <translation>Adâncime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <source>Master</source>
+        <translation>Maestru</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <source>Buddy</source>
+        <translation>Companion</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <source>Location</source>
+        <translation>Locația</translation>
+    </message>
+</context>
+<context>
+    <name>PrintOptions</name>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
+        <source>Print options</source>
+        <translation>Opțiuni de printare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
+        <source>Print only selected dives</source>
+        <translation>Printează doar scufundările selectate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
+        <source>Print in color</source>
+        <translation>Printează în culori</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
+        <source>Print type</source>
+        <translation>Tipul printării</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
+        <source>6 dives per page</source>
+        <translation>6 scufundări pe pagină</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
+        <source>2 dives per page</source>
+        <translation>2 scufundări pe pagină</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
+        <source>Table print</source>
+        <translation>Printează ca tabel</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
+        <source>Ordering</source>
+        <translation>Ordine</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
+        <source>Profile on top</source>
+        <translation>Profilul la început</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
+        <source>Notes on top</source>
+        <translation>Notițele la început</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
+        <source>Sizing heights (% of layout)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
+        <source>Profile height (43% - 85%)</source>
+        <translation>Înălțimea profilului(43%-85%)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
+        <source>Other data height (8% - 17%)</source>
+        <translation>Inălțimea celorlalte informații (8% - 17%)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
+        <source>Notes height (0% - 52%)</source>
+        <translation>Înălțimea notițelor (0% - 52%)</translation>
+    </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>0</translation>
+    </message>
+</context>
+<context>
+    <name>ProfilePrintModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
+        <source>unknown</source>
+        <translation>necunoscut</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
+        <source>Dive #%1 - %2</source>
+        <translation>Scufundarea  #%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
+        <source>Max depth: %1 %2</source>
+        <translation>Adâncimea maximă: %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
+        <source>Duration: %1 min</source>
+        <translation>Durata: %1 min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <source>Gas Used:</source>
+        <translation>Gaz Folosit:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
+        <source>SAC:</source>
+        <translation>SAC:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
+        <source>Max. CNS:</source>
+        <translation>CNS Max. :</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
+        <source>Weights:</source>
+        <translation>GreutățiȘ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
+        <source>Notes:</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
+        <source>Divemaster:</source>
+        <translation>Maestru scufundare:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <source>Buddy:</source>
+        <translation>Companion:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <source>Suit:</source>
+        <translation>Costum:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <source>Viz:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <source>Rating:</source>
+        <translation>Rating:</translation>
+    </message>
+</context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Adaugă Schimbare Gaz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Adaugă Semn de Carte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Șterge Eveniment</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Șterge evenimente similare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Arată toate evenimentele</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
+        <source>AIR</source>
+        <translation>AER</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
+        <source>Remove this Point</source>
+        <translation>Șterge acest Punct</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <source>Close</source>
+        <translation>Închide</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Medie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minim</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maxim</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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>
+</context>
+<context>
+    <name>RenumberDialog</name>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="14"/>
+        <source>Renumber</source>
+        <translation>Renumerotează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="31"/>
+        <source>New starting number</source>
+        <translation>Nou număr de început</translation>
+    </message>
+</context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Mută timpurile selectate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>mai devreme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>mai târziu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShiftTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Mută timpurile selectate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="37"/>
+        <source>Shift times of selected dives by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="73"/>
+        <source>h:mm</source>
+        <translation>o:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="83"/>
+        <source>earlier</source>
+        <translation>mai devreme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>later</source>
+        <translation>mai târziu</translation>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceAbout</name>
+    <message>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation>Despre Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="80"/>
+        <source>&amp;License</source>
+        <translation>&amp;Licență</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="87"/>
+        <source>&amp;Website</source>
+        <translation>&amp;Website</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Închide</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <source>Webservice</source>
+        <translation>Serviciu Web</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
+        <source>Connecting...</source>
+        <translation>Se conectează...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
+        <source>Download finished</source>
+        <translation>S-a terminat descărcarea</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
+        <source>Connection Error: </source>
+        <translation>Eroare de conexiune</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <source>Invalid user identifier!</source>
+        <translation>Identificator de utilizator invalid!</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Cannot parse response!</source>
+        <translation>Nu se poate parsa răspunsul!</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
+        <source>Download Success!</source>
+        <translation>Descărcarea s-a încheiat cu succes!</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <location filename="../qt-ui/tableview.cpp" line="23"/>
+        <source>Add Cylinder</source>
+        <translation>Adaugă Tub</translation>
+    </message>
+</context>
+<context>
+    <name>TankInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>Description</source>
+        <translation>Descriere</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+</context>
+<context>
+    <name>ToolTipItem</name>
+    <message>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
+        <source>Information</source>
+        <translation>Informații</translation>
+    </message>
+</context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Manual Utilizator</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Nu s-a putut găsi manualul pentru Subsurface</translation>
+    </message>
+</context>
+<context>
+    <name>WSInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>Description</source>
+        <translation>Descriere</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+</context>
+<context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Webservice Connection</source>
+        <translation>Conexiune Serviciu Web</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="25"/>
+        <source>Status:</source>
+        <translation>Status:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="32"/>
+        <source>Enter your ID here</source>
+        <translation>Introduceți-vă ID-ul aici</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
+        <source>Download</source>
+        <translation>Descarcă</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
+        <source>User ID</source>
+        <translation>ID-ul utilizatorului</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
+        <source>Upload</source>
+        <translation>Uploadează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
+        <source>Transfering data...</source>
+        <translation>Se transferă datele...</translation>
+    </message>
+</context>
+<context>
+    <name>WeightModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Type</source>
+        <translation>Tip</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="416"/>
+        <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="441"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="442"/>
+        <source>lbs</source>
+        <translation>livre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="465"/>
+        <source>ft</source>
+        <translation>picioare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="466"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+</context>
+<context>
+    <name>YearlyStatisticsModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <source>Year 
+ &gt; Month / Trip</source>
+        <translation>An
+&gt; Luna / Excursie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
+        <source>Duration 
+ Total</source>
+        <translation>Durată
+Totală</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
+        <source>
+Average</source>
+        <translation>
+Medie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
+        <source>
+Shortest</source>
+        <translation>
+Cel mai scurt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
+        <source>
+Longest</source>
+        <translation>
+Cel mai lung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
+        <source>Depth (%1)
+ Average</source>
+        <translation>Adâncime (%1)
+Medie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
+        <source>
+Minimum</source>
+        <translation>
+Minim</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
+        <source>
+Maximum</source>
+        <translation>
+Maxim</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
+        <source>SAC (%1)
+ Average</source>
+        <translation>SAC (%1)
+Mediu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
+        <source>Temp. (%1)
+ Average</source>
+        <translation>Temp. (%1)
+Medie</translation>
+    </message>
+</context>
+<context>
+    <name>gettextFromC</name>
+    <message>
+        <location filename="../dive.c" line="57"/>
+        <source>pascal</source>
+        <translation>Pascal</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="62"/>
+        <location filename="../qt-gui.cpp" line="348"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="66"/>
+        <location filename="../qt-gui.cpp" line="351"/>
+        <source>psi</source>
+        <translation>livre pe inch pătrat</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="103"/>
+        <location filename="../qt-gui.cpp" line="327"/>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="108"/>
+        <location filename="../qt-gui.cpp" line="332"/>
+        <source>cuft</source>
+        <translation>picioare cubice</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="137"/>
+        <location filename="../qt-gui.cpp" line="232"/>
+        <location filename="../qt-gui.cpp" line="247"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="142"/>
+        <location filename="../qt-gui.cpp" line="235"/>
+        <location filename="../qt-gui.cpp" line="249"/>
+        <source>ft</source>
+        <translation>picioare</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="258"/>
+        <location filename="../qt-gui.cpp" line="268"/>
+        <source>lbs</source>
+        <translation>livre</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="191"/>
+        <location filename="../qt-gui.cpp" line="256"/>
+        <location filename="../qt-gui.cpp" line="266"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="1104"/>
+        <source>(%s) or (%s)</source>
+        <translation>(%s) sau (%s)</translation>
+    </message>
+    <message>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
+        <source>air</source>
+        <translation>aer</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="170"/>
+        <source>integrated</source>
+        <translation>integrat</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="171"/>
+        <source>belt</source>
+        <translation>curea</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="172"/>
+        <source>ankle</source>
+        <translation>gleznă</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="173"/>
+        <source>backplate weight</source>
+        <translation>greutate placă spate</translation>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="174"/>
+        <source>clip-on</source>
+        <translation>clip-on</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
+        <source>Failed to read &apos;%s&apos;</source>
+        <translation>Nu s-a putut citi &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
+        <source>Maximum number of supported columns on CSV import is %d</source>
+        <translation>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>none</source>
+        <translation>niciunul</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>deco stop</source>
+        <translation>oprire de decompresie</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ascent</source>
+        <translation>ascensiune</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ceiling</source>
+        <translation>plafon</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>workload</source>
+        <translation>volum de muncă</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>transmitter</source>
+        <translation>transmițător</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>violation</source>
+        <translation>încălcare</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>bookmark</source>
+        <translation>semn de carte</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>surface</source>
+        <translation>suprafață</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>safety stop</source>
+        <translation>oprire pentru siguranță</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>gaschange</source>
+        <translation>schimbarea gazului</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (voluntary)</source>
+        <translation>oprire pentru siguranță (voluntară)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (mandatory)</source>
+        <translation>oprire pentru siguranță (obligatorie)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>deepstop</source>
+        <translation>deepstop</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>ceiling (safety stop)</source>
+        <translation>plafon (oprire pentru siguranță)</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>divetime</source>
+        <translation>timp scufundare</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <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="143"/>
+        <source>maxdepth</source>
+        <translation>adâncime maximă</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>airtime</source>
+        <translation>timp aer rămas</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>rgbm</source>
+        <translation>rgbm</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>heading</source>
+        <translation>direcție</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>tissue level warning</source>
+        <translation>avertizare nivel țesut</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>non stop time</source>
+        <translation>timp fără oprire</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="161"/>
+        <source>invalid event number</source>
+        <translation>numărul evenimentul este invalid</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="403"/>
+        <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="409"/>
+        <source>Error registering the data</source>
+        <translation>Eroare înregistrând datele</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="417"/>
+        <source>Error parsing the datetime</source>
+        <translation>Eroare parsând data</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="433"/>
+        <source>Dive %d: %s %d %04d</source>
+        <translation>Scufundarea %d: %s %d %04d</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="438"/>
+        <source>Error parsing the divetime</source>
+        <translation>Eroare parsând data</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="447"/>
+        <source>Error parsing the maxdepth</source>
+        <translation>Eroare parsând adâncimea maximă</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="456"/>
+        <source>Error parsing the gas mix count</source>
+        <translation>Eroare parsând valoarea amestecului de gaz</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="468"/>
+        <source>Error obtaining water salinity</source>
+        <translation>Eroare obținând salinitatea apei</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="476"/>
+        <source>Error obtaining surface pressure</source>
+        <translation>Eroare obținând presiunea la suprafață</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="484"/>
+        <source>Error parsing the gas mix</source>
+        <translation>Eroare parsând amestecul de gaz</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="491"/>
+        <source>Error parsing the samples</source>
+        <translation>Eroare parsând eșantioanele</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="621"/>
+        <source>Event: waiting for user action</source>
+        <translation>Eveniment: aștept acțiunea utilizatorului</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="629"/>
+        <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="689"/>
+        <source>Error registering the event handler.</source>
+        <translation>Eroare la înregistrarea handlerului de evenimente.</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="694"/>
+        <source>Error registering the cancellation handler.</source>
+        <translation>Eroare la înregistrarea handlerului de anulare.</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="715"/>
+        <source>Dive data import error</source>
+        <translation>Eroare la importarea datelor despre scufundare</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="754"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation>Nu s-a putut crea contextul libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="761"/>
+        <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="484"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Valoare procentuală neobișnuită %s
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1625"/>
+        <source>Failed to parse '%s'.
+</source>
+        <translation>Nu s-a putut parsa ”%s”.
+</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1626"/>
+        <source>Failed to parse &apos;%s&apos;</source>
+        <translation>Nu s-a putut parsa „%s”</translation>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1845"/>
+        <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="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
+        <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="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
+        <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="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <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="97"/>
+        <location filename="../statistics.c" line="361"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="132"/>
+        <source>Can&apos;t find gas %d/%d</source>
+        <translation>Nu s-a putut găsi gazul %d/%d</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="324"/>
+        <source>Too many gas mixes</source>
+        <translation>Prea multe amestecuri de gaz</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="504"/>
+        <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>
+    </message>
+    <message>
+        <location filename="../planner.c" line="545"/>
+        <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>
+    </message>
+    <message>
+        <location filename="../planner.c" line="554"/>
+        <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>
+    </message>
+    <message>
+        <location filename="../planner.c" line="565"/>
+        <source>Switch gas to %s
+</source>
+        <translation>Schimbați gazul la %s
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="573"/>
+        <source>Gas consumption:
+</source>
+        <translation>Consum de gaz:
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="584"/>
+        <source>%.0f%s of %s
+</source>
+        <translation>%.0f%s de %s
+</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="783"/>
+        <source>ean</source>
+        <translation>ean</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1234"/>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1238"/>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1247"/>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
+        <source>%sT: %d:%02d min</source>
+        <translation>%sT: %d:%02d min</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
+        <source>%s %sD:%.1f%s</source>
+        <translation>%s %sD:%.1f%s</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1430"/>
+        <source>%s %sD:%.1f%s
+</source>
+        <translation>%s %sD:%.1f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1434"/>
+        <source>%s%sV:%.2f%s</source>
+        <translation>%s%sV:%.2f%s</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
+        <source>%s %sV:%.2f%s</source>
+        <translation>%s %sV:%.2f%s</translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1449"/>
+        <source>%s %sP:%d %s</source>
+        <translation>%s %sP:%d %s</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="308"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="311"/>
+        <source>F</source>
+        <translation>F</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="498"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="511"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation>%1 %2, %3
+%4:%5</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="524"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation>%1 %2 (%3 scufundări)</translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="529"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation>%1 %2 (1 scufundare)</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>boat</source>
+        <translation>ambarcațiune</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>shore</source>
+        <translation>țărm</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>drift</source>
+        <translation>derivă</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>deep</source>
+        <translation>adânc</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>cavern</source>
+        <translation>cavernă</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>ice</source>
+        <translation>gheață</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>wreck</source>
+        <translation>epavă</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>cave</source>
+        <translation>peșteră</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>altitude</source>
+        <translation>altitudine</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>pool</source>
+        <translation>piscină</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>lake</source>
+        <translation>lac</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>river</source>
+        <translation>râu</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>night</source>
+        <translation>noapte</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation>proaspăt</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation>student</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
+        <translation>fotografie</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
+        <translation>videoclip</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation>instructor</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
+        <source>deco</source>
+        <translation>decompresie</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="216"/>
+        <source>more than %d days</source>
+        <translation>mai mult de %d zile</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="222"/>
+        <source>%dd %dh %dmin</source>
+        <translation>%dz %do %dmin</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dh %dmin</source>
+        <translation>%do %dmin</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="235"/>
+        <source>for dives #</source>
+        <translation>pentru scufundările nr.</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="242"/>
+        <source>for selected dives</source>
+        <translation>pentru scufundările selectate</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="277"/>
+        <source>for dive #%d</source>
+        <translation>pentru scufundarea nr. %d</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="279"/>
+        <source>for selected dive</source>
+        <translation>pentru scufundarea selectată</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="281"/>
+        <source>for all dives</source>
+        <translation>pentru toate scufundările</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="283"/>
+        <source>(no dives)</source>
+        <translation>(nicio scufundare)</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sun</source>
+        <translation>Duminică</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Mon</source>
+        <translation>Luni</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Tue</source>
+        <translation>Marți</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Wed</source>
+        <translation>Miercuri</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Thu</source>
+        <translation>Joi</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Fri</source>
+        <translation>Vineri</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sat</source>
+        <translation>Sâmbătă</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jan</source>
+        <translation>Jan</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Feb</source>
+        <translation>Feb</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Mar</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Apr</source>
+        <translation>Apr</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>May</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jun</source>
+        <translation>Iun</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Jul</source>
+        <translation>Iul</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Aug</source>
+        <translation>Aug</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Oct</source>
+        <translation>Oct</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Nov</source>
+        <translation>Noi</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Dec</source>
+        <translation>Dec</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="24"/>
+        <source>Uemis Zurich: File System is almost full
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+        <translation>Uemis Zurich: Sistemul de Fișiere este aproape plin
+Deconectați/reconectați computerul de scufundări
+si faceți click pe „Reîncercați”</translation>
+    </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>Uemis Zurich: Sistemul de Fișiere este plin
+Deconectați/reconectați computerul de scufundări
+si reîncercați</translation>
+    </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>Scriere scurtă în fișierul req.txt
+Este Uemis Zurich conectat corect?</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="107"/>
+        <source>unknown</source>
+        <translation>necunoscut</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="379"/>
+        <source>Reading %s %s</source>
+        <translation>Citind %s %s</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="399"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>divelog entry id</source>
+        <translation>id-ul înregistrării în divelog</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="422"/>
+        <source>divespot data id</source>
+        <translation>id-ul înregistrării în divespot</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="424"/>
+        <source>more data dive id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>wetsuit</source>
+        <translation>wetsuit</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>semidry</source>
+        <translation>semidry</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>drysuit</source>
+        <translation>drysuit</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>shorty</source>
+        <translation>shorty</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>vest</source>
+        <translation>vest</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>long john</source>
+        <translation>long john</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>jacket</source>
+        <translation>jacket</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>full suit</source>
+        <translation>full suit</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>2 pcs full suit</source>
+        <translation>full suit 2 părți</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="620"/>
+        <source>membrane</source>
+        <translation>membrană</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="802"/>
+        <source>Init Communication</source>
+        <translation>Inițializează Comunicarea</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="804"/>
+        <source>Uemis init failed</source>
+        <translation>Inițializarea Uemis a eșuat</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="815"/>
+        <source>Start download</source>
+        <translation>Începe descărcarea</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="196"/>
+        <source>Safety Stop Violation</source>
+        <translation>Încălcare a Opririi pentru Siguranță</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="198"/>
+        <source>Speed Alarm</source>
+        <translation>Alarmă de viteză</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="201"/>
+        <source>Speed Warning</source>
+        <translation>Avertizare de viteză</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="203"/>
+        <source>PO2 Green Warning</source>
+        <translation>Avertizare Verde PO2</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="206"/>
+        <source>PO2 Ascend Warning</source>
+        <translation>Avertizare de Ascensiune PO2</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="208"/>
+        <source>PO2 Ascend Alarm</source>
+        <translation>Alarmă de Ascensiune PO2</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="212"/>
+        <source>Tank Pressure Info</source>
+        <translation>Informații Presiune Tub</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="214"/>
+        <source>RGT Warning</source>
+        <translation>Avertizare RGT</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="216"/>
+        <source>RGT Alert</source>
+        <translation>Alertă RGT</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="218"/>
+        <source>Tank Change Suggested</source>
+        <translation>Schimbarea tubului este sugerată</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="220"/>
+        <source>Depth Limit Exceeded</source>
+        <translation>Adâncimea maximă a fost depășită</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="222"/>
+        <source>Max Deco Time Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="224"/>
+        <source>Dive Time Info</source>
+        <translation>Informații despre timpul scufundării</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="226"/>
+        <source>Dive Time Alert</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="228"/>
+        <source>Marker</source>
+        <translation>Marker</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="230"/>
+        <source>No Tank Data</source>
+        <translation>Nu există date despre tub</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="232"/>
+        <source>Low Battery Warning</source>
+        <translation>Avertizare de Baterie Scăzută</translation>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="234"/>
+        <source>Low Battery Alert</source>
+        <translation>Alertă de Baterie Scăzută</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index c7b7e9a59..bcbc86172 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Файл CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Разделитель</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Положение полей</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Импорт файла CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Время</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Глуб.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Темп.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Остановка</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Шаблоны</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Журнал в формате CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV файлы (*.csv);;Все файлы(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Объем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Раб.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Нач.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Кон.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Замена на</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Баллон не может быть удален</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>Бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>куб. фут</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Имя устройства</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Удалить этот дайв-компьютер.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>воздух</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Переход на Откр. Цикл</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation> начало</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>воздух</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>куб.фут/мин</translation>
     </message>
@@ -209,101 +174,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Показать поле поиска</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>развернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>свернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>свернуть остальные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>удалить погружение(-я) из поездки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>создать новую поездку выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>добавить к поездке выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>объединить с поездкой выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>объединить с поездкой ниже</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>удалить погружение(-я)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>пометить как некорректные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>экспорт UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>сдвинуть время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>выгрузить на divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Сохранить погружения как...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>объединить выбранные </translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Разделитель</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Положение полей</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Глубина</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Остановка</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Время</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Темп.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Единицы</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Метрическая</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Имперская</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Метки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Партнер</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Примечания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Вес</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Ошибка позиции обработчика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
         <translation>Одна или несколько остановок будут утеряны во время этой
@@ -370,37 +494,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Конечная глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Используемый газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>Настройка CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Отменить план?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Вы собираетесь отказаться от плана.</translation>
     </message>
@@ -408,85 +532,158 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Точки погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Доступные газы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>Добавить точку погружения</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>№</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>дата</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>м</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Давление</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>фут</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>мин</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>кг</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>фунт</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>костюм</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>баллон</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>местоположение</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>№</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>дата</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>фут</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>мин</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>фунт</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>костюм</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>баллон</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>местоположение</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>макс.CNS</translation>
     </message>
@@ -494,115 +691,115 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Неверный ответ сервера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Неверный XML ответ. Строка %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>не выбраны погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>ошибка создания zip-файла для выгрузки: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>ошибка создания временного файла: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>внутренняя ошибка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>внутренняя ошибка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Выгрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Загрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Загрузка %1 погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Загрузка завершена - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Поврежденная загрузка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Невозможно открыть архив:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Выгрузка не удалась</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Выгрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Ошибка входа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Ошибка разбора ответа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Ошибка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Выгрузка завершена</translation>
     </message>
@@ -610,48 +807,54 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Повторить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Файлы журналов (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Дамп-файлы (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ Please, remove them first.</source>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Изменить место погружений</translation>
     </message>
@@ -728,13 +931,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Погружение</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -760,11 +963,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>Темп. воздуха</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>Темп. воды</translation>
     </message>
@@ -790,7 +995,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
@@ -901,92 +1106,102 @@ Please, remove them first.</source>
         <translation>Погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Добавить баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Грузы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Добавить груз</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Местонахождение поездки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Заметки к поездке</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Редактирование поездки.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Множественное редактирование.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Редактирование погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>В</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>З</translation>
     </message>
@@ -994,428 +1209,518 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>Журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>Новый журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Импорт файлов</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Экспорт UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Импорт из дайвкомпьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Импорт данных GPS из сервиса Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>Список дайвкомпьютеров</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>Перенумеровать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Переключить масштаб</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Статистика за год</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Список погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Руководство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Карта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Планировщик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Импорт CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Импорт CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Импорт с сайта Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Предпочтения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Добавить погружение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Авто-группировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Пред. компьютер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Влево</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>След. компьютер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Вправо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Выбрать события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Ввести план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>О Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Руководство пользователя</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Руководство не найдено</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Закончите редактирование прежде чем редактировать другое.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Статистика за год</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ Please, remove them first.</source>
         <translation>Использовать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Система мер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Метрическая</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Имперская</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Настроить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>метр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>литр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>цельсий</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>фаренгейт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Язык системы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Давление</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Объем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Единицы времени</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Делитель скорости спуска/подъема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Минуты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Секунды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Показывать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>порог</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>макс. ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Потолок компьютера</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>потолок красным</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Расчётный потолок</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>все ткани</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>шаг 3м</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Рассчитывать NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow на макс. грубине</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Разное</translation>
     </message>
@@ -1697,37 +1980,32 @@ Please, remove them first.</source>
         <translation>Предпочтения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Необходим перезапуск</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Для смены языка необходимо перезапустить Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Журнал по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Просмотр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
@@ -1873,216 +2151,116 @@ Please, remove them first.</source>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Добавить замену смеси</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Добавить закладку</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Удалить событие</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Скрыть похожие события</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Показать все события</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Спрятать события</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Спрятать все события %1?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Удалить выбранное событие?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>неизвестный компьютер</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Длительность: 10 мин</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Масштаб</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Рулетка</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Параметры сегмента погружения</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Масштаб по размеру экрана</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Редактировать</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>воздух</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Переход на Откр. Цикл</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation> начало</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation> конец</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Погружение №%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Макс. глубина: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Длительность: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Газы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Макс. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Грузы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Инструктор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Видимость:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Рейтинг:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Добавить замену смеси</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Добавить закладку</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Удалить событие</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Скрыть похожие события</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Показать все события</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Удалить эту точку</translation>
     </message>
@@ -2092,22 +2270,22 @@ Please, remove them first.</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Средняя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Выберите место на карте двойным щелчком мыши.</translation>
     </message>
@@ -2125,6 +2303,59 @@ Please, remove them first.</source>
         <translation>Начать нумерацию с</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Сдвинуть время</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>раньше</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>позже</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Please, remove them first.</source>
         <translation>О Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Мультиплатформенный журнал погружений&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Линус Торвальдс, Дирк Хондел и другие, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>Лицензия</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>Веб-сайт</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Please, remove them first.</source>
         <translation>Вебсервис</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Соединение...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Загрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Ошибка загрузки: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Ошибка соединения:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Неверный идентификатор пользователя!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Невозможно разобрать ответ!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Успешная загрузка!</translation>
     </message>
@@ -2230,17 +2466,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
@@ -2248,20 +2484,33 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Руководство пользователя</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Руководство не найдено</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2284,32 +2533,32 @@ Please, remove them first.</source>
         <translation>Укажите свой идентификатор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Загрузить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>ID пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Выгрузить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Таймаут выполнения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Передача данных...</translation>
     </message>
@@ -2317,117 +2566,117 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Удалить эту грузовую систему.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>м</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Год 
  &gt; Месяц / Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Длительность
 Общее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 Кратчайшее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 Самое долгое</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Глубина (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Темп. (%1)
@@ -2443,25 +2692,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>куб. фут</translation>
     </message>
@@ -2494,17 +2743,17 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>воздух</translation>
     </message>
@@ -2536,20 +2785,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Ошибка чтения &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Ошибка чтения &apos;%s&apos;. Используйте импорт CSV.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation>
     </message>
@@ -2691,17 +2936,17 @@ Maximum</source>
         <translation>неверный номер события</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Невозможно создать анализатор для %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Ошибка регистрации данных</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Ошибка разбора даты/времени</translation>
     </message>
@@ -2716,133 +2961,158 @@ Maximum</source>
         <translation>Ошибка разбора времени погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <source>Error parsing the maxdepth</source>
         <translation>Ошибка разбора макс. глубины</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Ошибка получения солености воды</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Ошибка получения давления на поверхности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Ошибка разбора смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Ошибка разбора выборки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Событие: ожидание действия пользователя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Ошибка импорта данных погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Невозможно открыть %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Странное значение процентов %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Ошибка разбора &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Ошибка разбора &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Ошибка запроса get_events в БД.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Ошибка соединения с БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Ошибка запроса к БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Невозможно открыть файл преобразования %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Не найдена смесь %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Слишком много смесей</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,274 +3125,262 @@ based on GFlow = %.0f and GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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="551"/>
+        <location filename="../planner.c" line="554"/>
         <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="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Замена смеси на %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Расход газа:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-C:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Расчетный потолок %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Ткани %.0fмин: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Ост.безоп:%uмин @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-Г:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fл/мин</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Ост.безоп:неизв. время @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Деко:%uмин @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Деко:неизв. время @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-В деко</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%uмин</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fбар</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fбар</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fбар</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Деко:%uмин @ %.0f %s (расч)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-В деко (расч)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%uмин (расч)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%uмин (расч)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sГ:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sГ:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sД:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 погружений)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 погружение)</translation>
     </message>
@@ -3222,142 +3480,142 @@ TTS:%uмин (расч)</translation>
         <translation>деко стоп</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>более %d дней</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>для погружений №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>для выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>для погружения №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>для выбранного погружения</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>для всех погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(нет погружений)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Янв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Мар</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Июн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Июл</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Снт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Ноя</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -3387,187 +3645,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Проверьте подключение Uemis Zurich.</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Чтение %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>данные</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>ид. записи журнала</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>ид. места погружения</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>ид. дополнительных данных погружения</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>мокрый</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>полусухой</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>сухой</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>короткий</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>жилет</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>комбинезон</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>куртка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>полный</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>полный из 2-х</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>мембрана</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Инициализация связи</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Ошибка инициализации Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Начать загрузку</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Нарушение остановки безопасности</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Тревога: скорость</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Внимание: скорость</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Внимание: PO2 (зеленый)</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Внимание: PO2 при подъеме</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Тревога: PO2 при подъеме</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Давление в баллоне</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Внимание: RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Тревога: RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Предложена смена баллона</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Превышен лимит глубины</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Внимание: макс. время деко</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Время погружения</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Тревога: время погружения</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Метка</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Нет данных о баллоне</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Внимание: заряд батареи</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Тревога: заряд батареи</translation>
     </message>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 94108cb37..a4676effd 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Import súboru (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Oddeľovač položiek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Configurácia položiek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Import CSV súboru</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Teplota</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Deco stop</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Predkonfigurovaný import</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Otvor CSV Log súbor</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV súbory (*.csv);;Všetky súbory</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Veľkosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Max. tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Poč. tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Konc. tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Zmeň v</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaša nemôže byť vymazaná</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ vybraný počítač?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>ID zariadenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Voliteľný názov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Kliknutín sem vymažeš počítač.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>vzduch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Záchrana na OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>začiatok</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>vzduch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -209,101 +174,260 @@ vybraný počítač?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Zobraz vyhľadávací box</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>zobraz všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>zblaľ všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>zbaľ ostatné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>vymaž ponor(y) z akcie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>vytvor novú akciu vyššie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <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="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>spoj akciu s akciou vyššie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>spoj akciu s akciou nižšie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>zmaž ponor(y)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>označ neplatné ponor(y)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>uložiť ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>exportuj ako UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>posun času</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>nahraj ponor(y) na </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Uložiť ponory ako...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Uložiť súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF súbory (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>zluč vybrané ponory</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Oddeľovač položiek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Configurácia položiek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Deco stop</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Teplota</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Jednotky</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrický</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperiálny</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Hmotnosť</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30 stôp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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é.
@@ -370,37 +494,37 @@ Vymaž ich prosím.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>Vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Cieľová hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Použitá zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Vymazať plán?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Chystáš sa vymazať svoj plán.</translation>
     </message>
@@ -408,85 +532,158 @@ Vymaž ich prosím.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Zmesi k dispozícií</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>dátum</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>US libra</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>oblek</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>fl.</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>lokalita</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>dátum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>US libra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>oblek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>fl.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>lokalita</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>Spotreba plynu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -494,115 +691,115 @@ Vymaž ich prosím.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Neplatná odpoveď zo servera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>neboli vybrané žiadne ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>zlyhanie pri vytváraní zip súboru pre nahratie: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>nie je možné vytvoriť dočasný súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>interná chyba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>interná chyba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Nahrávanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Sťahovanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Sťahovanie %1 ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Poškodené sťahovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Nahrávanie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Úspešne nahrávanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Prihlásenie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Neviem spracovať odpoveď</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Chyba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Nahrávanie ukončené</translation>
     </message>
@@ -610,48 +807,54 @@ Vymaž ich prosím.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Skús znovu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Log súbory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump súbory</translation>
     </message>
@@ -719,7 +922,7 @@ Vymaž ich prosím.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Edituj označené potápašské lokality</translation>
     </message>
@@ -728,13 +931,13 @@ Vymaž ich prosím.</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
@@ -760,11 +963,13 @@ Vymaž ich prosím.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <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="236"/>
         <source>Water temp</source>
         <translation>Teplota vody</translation>
     </message>
@@ -790,7 +995,7 @@ Vymaž ich prosím.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
@@ -901,92 +1106,102 @@ Vymaž ich prosím.</translation>
         <translation>Ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Fľaše</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Pridaj fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Závažia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Pridaj závažia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Lokalita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>Táto akcia je editovaná.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>Viaceré ponory sú editované.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>Tento ponor sa edituje.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -994,428 +1209,518 @@ Vymaž ich prosím.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;Súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Náhľad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nový logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Otvoriť logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Otvor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Uložiť ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Import súborov</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Export &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Tlačiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Ukončiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Import z &amp;počítača</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Edituj názov zariadenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Prečisluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Označit &amp;Zväčšiť</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Ročná štatistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Zoznam ponorov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Všetko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>Užívateľský &amp;Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Zemeguľa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanuj ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Import CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Import CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Import z Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Nastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Pridaj ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Automatické zgrupovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Predchádzajúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Šipka v ľavo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Nasledujúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Šipka v pravo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Voľba udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Plánovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Užívateľská príručka</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Neviem nájsť manuál</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Uložiť zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Ulož alebo zruš aktuálne editovanie ponoru pred začatím editovania iného ponoru.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Uložiť súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF súbory (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Ročná štatistika</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ Vymaž ich prosím.</translation>
         <translation>Použi prednastavenú fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>Systém</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrický</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperiálny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personalizácia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>stopa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Systémove prednastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Objem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Časové jednotky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Zobraz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>hranica</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Strop hlásený počítačom</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>zobraz strop červenou</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Zrátaný strop</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>zobraz všetky tkanivá</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m krok</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Zrátaj </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow na max. hĺbke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Rôzne</translation>
     </message>
@@ -1697,37 +1980,32 @@ Vymaž ich prosím.</translation>
         <translation>Nastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>Spotreba plynu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Potrebný reštart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Otvor predvolený Log súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Vymaž ich prosím.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>&amp;Náhľad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>T&amp;lač</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>&amp;Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Tlačiť</translation>
     </message>
@@ -1873,216 +2151,116 @@ Vymaž ich prosím.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Pridaj zmenu zmesi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Pridať Bookmark</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Vymaž udalosť</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Schovaj podobné udalosti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Zobraziť všetky udalosti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Schovaj udalosti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Schovať všetky %1 udalosti?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Zmazať vybrané udalosti?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>neznámy počítač</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Stupnica</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Pravítko</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Zväčši ponor na veľkosť obrazovky</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Editovať</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>vzduch</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Záchrana na OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>začiatok</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>koniec</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Ponor #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Max hĺbka: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Trvanie: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Použitá zmes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Závažia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Viď:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Hodnotenie:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Pridaj zmenu zmesi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Pridať Bookmark</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Vymaž udalosť</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Schovaj podobné udalosti</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Zobraziť všetky udalosti</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>Vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Odstrániť tento bod</translation>
     </message>
@@ -2092,22 +2270,22 @@ Vymaž ich prosím.</translation>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Posuň mapu a dvojklikom označ miesto ponoru</translation>
     </message>
@@ -2125,6 +2303,59 @@ Vymaž ich prosím.</translation>
         <translation>Nové začiatočné číslo</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Posun vybraných časov</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>skôr</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>neskôr</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Vymaž ich prosím.</translation>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&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, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;Licencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Web stránka</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Zatvoriť</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Vymaž ich prosím.</translation>
         <translation>Webservis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Pripájam...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Chyba sťahovania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Chyba spojenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Neplatný identifikátor užívateľa!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Nemôžem spracovať odpoveď!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Nahrávanie úspešne ukončené!</translation>
     </message>
@@ -2230,17 +2466,17 @@ Vymaž ich prosím.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ Vymaž ich prosím.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Informácie</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Užívateľská príručka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Neviem nájsť manuál</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ Vymaž ich prosím.</translation>
         <translation>Vlož svoje ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Stiahnutie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>ID užívateľa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Nahratie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Čas operácie vypršal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Prenášanie dát...</translation>
     </message>
@@ -2317,114 +2566,114 @@ Vymaž ich prosím.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Mesiac / Akcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Trvanie
 Celkové</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>Najkratší</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>Najdlhší</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Hĺbka (%1)
  Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2440,25 +2689,25 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2491,17 +2740,17 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) alebo (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
@@ -2533,20 +2782,16 @@ Maximum</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Chyba pri načítaní &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Chyba pri čítaní &apos;%s&apos;. Použi import pre CSV súbory.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation>
     </message>
@@ -2688,17 +2933,17 @@ Maximum</translation>
         <translation>neplatné číslo udalosti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Chyba registrácie dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba spracovania času</translation>
     </message>
@@ -2713,133 +2958,158 @@ Maximum</translation>
         <translation>Chyba spracovania času ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba získania slanosti vody</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba pri zisťovaní tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Chyba spracovania vzoriek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Udalosť: Čakanie na vstup uživateľa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Chyba importu dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Zvláštne percenta v %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Chyba pri spracovaní &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Chyba pri spracovaní &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Neúspešná požiadavka: get_events.⏎
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Spojenie s databázou zlýhalo &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <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="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Neviem otvoriť šablónu </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Neviem nájsť zmes %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Príliš veľa zmesí</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2852,274 +3122,262 @@ zrátaný s GFlow = %.0f a GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Zmena plynu na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Spotreba plynu:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Vypočítaná hladina %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Tkanivo %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Bezpečnostná zastávka:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Bezpečnostná zastávka:nezn. čas @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco:nezn. čas @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-In deco</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-V deco (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 ponorov)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 ponor)</translation>
     </message>
@@ -3219,142 +3477,142 @@ TTS:%umin (calc)</translation>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>viac než %d dní</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>pre ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>pre vybrané ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>pre ponor #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>pre vybraný ponor</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>pre všetky ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(žiadné ponory)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>Ut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>St</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>Št</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>Pi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3384,187 +3642,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Je Uemis Zurich korektne pripojený?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Načítavam %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>id položky logu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>id dát miesta ponoru</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>id ďalších dát ponoru</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>neoprén</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>polosuchý</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>suchý oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>krátky</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>vesta</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>vesta</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>celotelový oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2 dielny oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Inicializácia komunikácie</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis - inicializácia neúspešná</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Začať nahrávanie</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Nedodržaná bezpečnostná zastávka</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm: Rýchlosť</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Upozornenie: Rýchlosť</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>PO2 Upozornenie: Zelená</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>PO2 Upozornenie: Výstup</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>PO2 Alarm: Výstup</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Info: Tlak vo fľaši</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Upozornenie: zostávajúci čas plynu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Alarm: zostávajúci čas plynu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Odporúčaná zmena fľaše</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Prekročená Maximálna Hĺbka</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Upozornenie: Max. dekompresný čas</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Info: Čas Ponoru</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Alarm Času Ponoru</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Značka</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Žiadne informácie o fľaši</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Upozornenie: Slabá batéria</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Alarm: Slabá batéria</translation>
     </message>
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index 911bd2af2..f4caf73e3 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -149,12 +149,12 @@
 <context>
     <name>DiveGasPressureItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="456"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="458"/>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -470,22 +470,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="124"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="126"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="373"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="374"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
         <translation type="unfinished"></translation>
@@ -494,37 +494,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="455"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1094"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1096"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1307"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -532,17 +532,17 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="942"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="945"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="963"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -691,114 +691,114 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="497"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="551"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="558"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="109"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="128"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="163"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="641"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="672"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="720"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="780"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="823"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="837"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="804"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -930,13 +930,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="454"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -962,11 +962,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation type="unfinished"></translation>
     </message>
@@ -992,7 +994,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1103,92 +1105,102 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="77"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="81"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="423"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
-        <location filename="../qt-ui/maintab.cpp" line="425"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="41"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="477"/>
-        <location filename="../qt-ui/maintab.cpp" line="485"/>
-        <location filename="../qt-ui/maintab.cpp" line="514"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="479"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1196,520 +1208,515 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="651"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="602"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="623"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="635"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="664"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="683"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="691"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="708"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="713"/>
-        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="719"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="724"/>
-        <location filename="../qt-ui/mainwindow.ui" line="727"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="730"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="735"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
         <source>Enable EAD, END, and EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="738"/>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="743"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="754"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="762"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="773"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="781"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="784"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="789"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="797"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="805"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="826"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="834"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="842"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="892"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="900"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="908"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="927"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="746"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="116"/>
-        <source>Old Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="126"/>
-        <source>New Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="165"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
         <source>Enable the pO2 Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="168"/>
-        <location filename="../qt-ui/mainwindow.ui" line="194"/>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
-        <location filename="../qt-ui/mainwindow.ui" line="246"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
-        <location filename="../qt-ui/mainwindow.ui" line="356"/>
-        <location filename="../qt-ui/mainwindow.ui" line="382"/>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
-        <location filename="../qt-ui/mainwindow.ui" line="460"/>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <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"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="191"/>
-        <source>Enable the pn2 Graph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
-        <source>Enable the phe graph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="243"/>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <source>Enable MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
         <source>Show the DC Reported Ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
         <source>Show the Calculated Ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="353"/>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
         <source>Show Calculated Ceiling with 3m Increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
-        <source>Show NTL / TTS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>Calculate All Tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Show SAC Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Enable / Disable the Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="751"/>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="765"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="776"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="866"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="916"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
         <source>Import Log Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="919"/>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="935"/>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
         <source>&amp;Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
         <source>Toggle Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
         <source>F11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="141"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="180"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="283"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="671"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="322"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="570"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="577"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="578"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="880"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="138"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="180"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="283"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="322"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="671"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1022"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="138"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="375"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
         <source>Yearly Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="881"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="999"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
         <source>Open Dive Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="999"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
         <source>Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1022"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1782,172 +1789,187 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
         <source>threshold when showing pO₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="534"/>
+        <location filename="../qt-ui/preferences.ui" line="581"/>
         <source>threshold when showing pN₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
         <source>threshold when showing pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="576"/>
+        <location filename="../qt-ui/preferences.ui" line="623"/>
         <source>max ppO₂ when showing MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
         <source>draw dive computer reported ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
         <source>unused tanks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="676"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="696"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="660"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="620"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1957,32 +1979,32 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="626"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="212"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="213"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="314"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="314"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2128,134 +2150,6 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
-        <source>Add Gas Change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
-        <source>Remove Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
-        <source>Hide similar events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="171"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="214"/>
-        <source>Hide events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="215"/>
-        <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="244"/>
-        <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="245"/>
-        <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="491"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="534"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="535"/>
-        <source>Ruler</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="537"/>
-        <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="538"/>
-        <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="551"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="637"/>
-        <source>pN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="663"/>
-        <source>pHe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="687"/>
-        <source>pO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="777"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1044"/>
-        <source>air</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="779"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1046"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1054"/>
-        <source>Bailing out to OC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1056"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1057"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
@@ -2332,27 +2226,27 @@ Please, remove them first.</source>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="621"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="640"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
         <source>Remove Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="645"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
         <source>Hide similar events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="659"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
         <source>Unhide all events</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2360,12 +2254,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="36"/>
         <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="715"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2390,7 +2284,7 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="241"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2520,42 +2414,42 @@ Please, remove them first.</source>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="379"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="425"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="428"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="431"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2589,7 +2483,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="145"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2658,12 +2552,12 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="256"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2838,15 +2732,15 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1081"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="490"/>
+        <location filename="../divelist.c" line="492"/>
         <location filename="../planner.c" line="95"/>
-        <location filename="../planner.c" line="775"/>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
         <location filename="../statistics.c" line="358"/>
         <location filename="../statistics.c" line="368"/>
         <source>air</source>
@@ -2880,16 +2774,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="368"/>
-        <location filename="../file.c" line="370"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="409"/>
-        <location filename="../file.c" line="411"/>
-        <location filename="../file.c" line="488"/>
-        <location filename="../file.c" line="490"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3041,82 +2935,82 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="418"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="450"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="456"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="473"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="491"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="499"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="693"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3150,7 +3044,7 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="170"/>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
@@ -3197,12 +3091,12 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="320"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="500"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -3211,103 +3105,103 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="545"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
+        <location filename="../planner.c" line="554"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="561"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="580"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
+        <location filename="../profile.c" line="1231"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1472"/>
+        <location filename="../profile.c" line="1234"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1476"/>
+        <location filename="../profile.c" line="1238"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1482"/>
+        <location filename="../profile.c" line="1244"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1485"/>
+        <location filename="../profile.c" line="1247"/>
         <source>SAC: %2.1fl/min
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1487"/>
+        <location filename="../profile.c" line="1249"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1489"/>
+        <location filename="../profile.c" line="1251"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1491"/>
+        <location filename="../profile.c" line="1253"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1493"/>
+        <location filename="../profile.c" line="1255"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1496"/>
+        <location filename="../profile.c" line="1258"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1502"/>
+        <location filename="../profile.c" line="1264"/>
         <source>EAD: %d%s
 END: %d%s
 EADD: %d%s
@@ -3315,120 +3209,120 @@ EADD: %d%s
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1509"/>
+        <location filename="../profile.c" line="1271"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1512"/>
+        <location filename="../profile.c" line="1274"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1517"/>
+        <location filename="../profile.c" line="1279"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1520"/>
+        <location filename="../profile.c" line="1282"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1524"/>
+        <location filename="../profile.c" line="1286"/>
         <source>In deco
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1526"/>
+        <location filename="../profile.c" line="1288"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1530"/>
+        <location filename="../profile.c" line="1292"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1538"/>
+        <location filename="../profile.c" line="1300"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1540"/>
+        <location filename="../profile.c" line="1302"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1543"/>
+        <location filename="../profile.c" line="1305"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1546"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1552"/>
+        <location filename="../profile.c" line="1314"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1558"/>
+        <location filename="../profile.c" line="1320"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1560"/>
+        <location filename="../profile.c" line="1322"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1667"/>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1671"/>
-        <location filename="../profile.c" line="1675"/>
-        <location filename="../profile.c" line="1679"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1683"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1687"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1691"/>
-        <location filename="../profile.c" line="1695"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1702"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3604,97 +3498,97 @@ EADD: %d%s
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="62"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="62"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="62"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="62"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="62"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="62"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="62"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="72"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="72"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="72"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="72"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="72"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="72"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3724,92 +3618,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 5580970f1..f15ee22cc 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>Importera fil (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>Fältavskiljare</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>Fältkonfiguration</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>Importera CSV fil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Djup</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>Stoppdjup</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>Förkonfigurerade importer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>Öppna CSV loggfil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation>CSV filer (*.csv);;Alla Filer(*)</translation>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Storlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>Arbetstryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>Byt vid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan inte tas bort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>ft³</translation>
     </message>
 </context>
 <context>
@@ -173,35 +95,78 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>Enhetsid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Klicka här för att ta bort denna dykdator</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Bailout till öppet system</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>start</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>luft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -209,101 +174,260 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>Visa sökruta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>kollapsa andra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>ta bort dyk från resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>skapa nytt resmål ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>lägg till dyk(en) till resmål direkt ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>sammanfoga resmål med resmål ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>sammanfoga resmål med resmål nedan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>radera dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>Markera dyk som ogiltiga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>Spara som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>Exportera som UDDF fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>skifta tider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>Ladda upp dyk till divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>Spara dyk som...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>Sammanslå dyk</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>Fältavskiljare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>Fältkonfiguration</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Djup</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>Stoppdjup</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>Enheter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrisk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>Taggar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Plats</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Parkamrat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Anteckningar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Vikt</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>Hantera possitionsfel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <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
@@ -370,37 +494,37 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>Slutdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>Använd gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>Kassera plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>Du kommer kassera din plan</translation>
     </message>
@@ -408,85 +532,158 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>Dykplaneringspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>Tillgängliga gaser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>lägg till dykdatapunkt</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>datum</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>Min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>pund</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>dräkt</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>flaska</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>plats</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation>PHE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>Min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>dräkt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>flaska</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>plats</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -494,115 +691,115 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>Ogiltigt svar från server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <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="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation>inga dyk var markerade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation>misslyckades med att skapa en zip-fil för uppladdning: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation>kunde inte skapa temporär fil: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation>internt fel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation>internt fel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>Klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>Laddar upp dyklista...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>Laddar ner dyklista...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>Laddar ner %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>Nedladdning klar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>Misslyckad nedladdning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <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="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>Uppladdning misslyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>Nedladdning lyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>Inloggning misslyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>Fel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>Uppladdning klar</translation>
     </message>
@@ -610,48 +807,54 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Försök igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <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="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <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="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation>Dumpfiler (*.bin)</translation>
     </message>
@@ -719,7 +922,7 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>Ändra valda dykplatser</translation>
     </message>
@@ -728,13 +931,13 @@ 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="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>Dykanteckningar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
@@ -760,11 +963,13 @@ vänligen ta bort dessa först.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>Lufttemp</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>Vattentemperatur</translation>
     </message>
@@ -790,7 +995,7 @@ vänligen ta bort dessa först.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
@@ -901,92 +1106,102 @@ vänligen ta bort dessa först.</translation>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Vikter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Lägg till Viktsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>Resmålsanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <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="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <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="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <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="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -994,428 +1209,518 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny Loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Öppna loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>&amp;Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Spara som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>Importera filer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportera &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>&amp;Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <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="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Ändra Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumrering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>Zoom av/på</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>Dyklista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>Alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Användarmanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>Glob</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>Pl&amp;anera Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>Importera CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>Importera CS&amp;V</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>Import från Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>Nytt dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>Autogruppering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>Föregående dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>Vänster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>Nästa dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>Höger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Välj händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Skriv plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Användarmanual</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>Kan inte hitta Subsurface manualen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Spara ändringar?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>Först avsluta den aktuella upplagan du försöker göra en annan.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Årsstatistik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ vänligen ta bort dessa först.</translation>
         <translation>Använd standardflaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>Personifiera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>Systemets standardvärde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>Volym</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>Tidsenheter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>Hastighetsnämnare.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>Minuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>Tröskel</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>Dykdator rapporterade tak</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>Visa tak i rött</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>Visa beräknad tak-information</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>Visa alla vävnader</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>Inkrement 3m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>Beräkna NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>GFLow på maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>Blandat</translation>
     </message>
@@ -1697,37 +1980,32 @@ vänligen ta bort dessa först.</translation>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>Omstart krävs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <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="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>Välj standard loggfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>Förhandsvisning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -1873,216 +2151,116 @@ vänligen ta bort dessa först.</translation>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>Lägg till gasbyte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>Lägg till bokmärke</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>Ta bort händelse</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>Göm liknande händelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation>Visa alla händelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>Göm händelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>Göm alla %1händelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>Ta bort markerad händelse</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>Okänd dykdator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>Sätt varaktighet: 10 minuter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>Skala</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>Linjal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>Mätegenskaper på dyksegment</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>Skala dyk till skärmstorlek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Redigera</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Bailout till öppet system</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>start</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>slut</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>Maxdjup: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>Varaktighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>Gas använd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>Vikter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>Ranking:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>Lägg till gasbyte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>Lägg till bokmärke</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>Ta bort händelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>Göm liknande händelser</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>Visa alla händelser</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>Ta bort denna punkt</translation>
     </message>
@@ -2092,22 +2270,22 @@ vänligen ta bort dessa först.</translation>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <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>
@@ -2125,6 +2303,59 @@ vänligen ta bort dessa först.</translation>
         <translation>Nytt startnummer</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>Skifta valda tider</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>tidigare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>senare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ vänligen ta bort dessa först.</translation>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-plattforms dykprogramvara&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, med fler, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>&amp;License</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>&amp;Hemsida</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>Stäng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ vänligen ta bort dessa först.</translation>
         <translation>Webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Ansluter...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>Nedladdning klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>Nedladdningsfel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Kontaktfel:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>Ogiltigt användarid!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Nedladdning lyckades!</translation>
     </message>
@@ -2230,17 +2466,17 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Användarmanual</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>Kan inte hitta Subsurface manualen</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ vänligen ta bort dessa först.</translation>
         <translation>Skriv in ditt ID här</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>Ladda ned</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Användarid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>Ladda upp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>Begäran tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>Överför data...</translation>
     </message>
@@ -2317,114 +2566,114 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <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="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Månad / Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>Varaktighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>Kortaste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>Längsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>Djup (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2440,25 +2689,25 @@ Medel</translation>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -2491,17 +2740,17 @@ Medel</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -2533,20 +2782,16 @@ Medel</translation>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Kunde inte öppna &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>Misslyckades att läsa %s&apos;. Använd Import av CSV filer</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maximalt antalet kolumner i CSV import är %d</translation>
     </message>
@@ -2688,17 +2933,17 @@ Medel</translation>
         <translation>okänt händelsenummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Kunde inte registrera parser-data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Kunde inte tolka tid och datum</translation>
     </message>
@@ -2713,133 +2958,158 @@ Medel</translation>
         <translation>Kunde inte tolka dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kunde inte få tag i tyck vid ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>Kunde inte tolka gasblandning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>Händelse: väntar på användaren</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>Kunde inte registrera event-funktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>Lyckades inte importera dykdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Konstig procent läsning %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Kunde inte läsa &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>Databasfråga get_events misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Databasanslutning misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Databasfråga misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kunde inte öppna formatmall %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Kan inte hitta gasen %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>För många gasblandningar</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2852,274 +3122,262 @@ baserad på GFlow = %.0f och GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Byt till gas %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Gasanvändning:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s av %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Beräknat tak %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-Vävnad %.0fmin: %0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Såkerhetsstopp:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-SAC:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Säkerhetsstopp:okänd tid @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deko:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deko:okänd tid @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-i deko</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deko:%umin @ %.0f %s (calc)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-i deko (calc)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (calc)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (calc)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
@@ -3219,142 +3477,142 @@ TTS:%umin (calc)</translation>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>mer än %d dagar</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>för dykningar #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>för utvalda dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>Dyk #%d </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>för valt dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>för alla dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(inga dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>sön</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>mån</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>tis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>lör</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -3384,187 +3642,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 Är Uemis Zurich ordentligt ansluten?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Läser %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>dyklog ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>dykplats ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>mer data dive id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>våtdräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>torrdräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>väst</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>Longjohn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>jacka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>fulldräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2 pcs full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Initierar anslutning</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Kunde inte läsa från Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Starta nedladdningen</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Säkerhetsstopp ej uppfyllt</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Alarm: uppstigningshastighet</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Varning: uppstigningshastighet</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Varning: grön PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Varning: uppstigning / PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Alarm: uppstigning / PO2</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Info: flasktryck</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Varning: gastid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Varning: gastid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Tankbyte rekommenderat</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Maxdjup har överskridits</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Varning: max dekotid</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Dyktidsnot</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Dyktidsvarning</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>markering</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Ingen flaskinformation</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Batterivarning</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Batterivarning</translation>
     </message>
diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts
new file mode 100644
index 000000000..611edcfd7
--- /dev/null
+++ b/translations/subsurface_tr.ts
@@ -0,0 +1,3802 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
+<context>
+    <name>CylindersModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Type</source>
+        <translation>Tür</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>Size</source>
+        <translation>Boyut</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>WorkPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>StartPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>EndPress</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>He%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="69"/>
+        <source>O</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <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="341"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="342"/>
+        <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="488"/>
+        <source>psi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="489"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="512"/>
+        <source>l</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="513"/>
+        <source>cuft</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveComputerManagementDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
+        <source>Edit Dive Computer Nicknames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="45"/>
+        <source>Remove the selected Dive Computer?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
+        <source>Are you sure that you want to 
+ remove the selected dive computer?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveComputerModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Model</source>
+        <translation>Model</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <source>Nickname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <source> end</source>
+        <comment>Starts with space!</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveGasPressureItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="456"/>
+        <source>air</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveItem</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
+        <source> l/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source> cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveListView</name>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
+        <source>Show Search Box</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <source>expand all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <source>collapse all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <source>collapse others</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <source>remove dive(s) from trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
+        <source>add dive(s) to trip immediately above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <source>merge trip with trip above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
+        <source>merge trip with trip below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
+        <source>delete dive(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <source>mark dive(s) invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <source>save As</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <source>export As UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
+        <source>shift times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
+        <source>upload dive(s) to divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
+        <source>Save Dives As...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
+        <source>Save File as</source>
+        <translation>Dosyayı Farklı Kaydet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF dosyaları (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
+        <source>merge selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>Metrik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Konum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <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"/>
+    </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="125"/>
+        <source>Last Stop at 6m</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"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
+        <source>10m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
+        <source>30ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
+        <source>Handler Position Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
+        <source>One or more of your stops will be lost with this operations, 
+Please, remove them first.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerPointsModel</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
+        <source>AIR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
+        <source>Final Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
+        <source>Used Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
+        <source>CC Set Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
+        <source>Discard the Plan?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
+        <source>You are about to discard your plan.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
+        <source>Dive Planner Points</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlotDataModel</name>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Basınç</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Sıcaklık</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>tarih</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>OTU</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>maxCNS</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
+        <source>Invalid response from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
+        <source>no dives were selected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
+        <source>failed to create zip file for upload: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
+        <source>cannot create temporary file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
+        <source>internal error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
+        <source>internal error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
+        <source>Done</source>
+        <translation>Bitti</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
+        <source>Corrupted download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <source>Upload failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
+        <source>Upload successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
+        <source>Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
+        <source>Cannot parse response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
+        <source>Error: %1</source>
+        <translation>Hata: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDCWidget</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>OK</source>
+        <translation>TAMAM</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
+        <source>Error</source>
+        <translation>Hata</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <source>Retry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
+        <source>Choose file for divecomputer download logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
+        <source>Log files (*.log)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
+        <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="346"/>
+        <source>Choose file for divecomputer binary dump file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <source>Dump files (*.bin)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DownloadFromDiveComputer</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <source>Download From Dive Computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <source>Vendor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <source>Dive Computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <source>Device or Mount Point</source>
+        <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>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <source>Force download of all dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <source>Always prefer downloaded dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <source>OK</source>
+        <translation>TAMAM</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
+        <source>Edit Selected Dive Locations</source>
+        <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="444"/>
+        <source>Dive Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="120"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
+        <source>Location</source>
+        <translation>Konum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <source>Coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </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="235"/>
+        <source>Air temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
+        <source>Water temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <source>Rating</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <source>Visibility</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <source>Equipment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <source>Dive Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="395"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <source>Interval</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <source>Gases Used</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <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"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <source>Max. Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <source>Ave. Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <source>OTU</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <source>Air Pressure</source>
+        <translation>Hava Basıncı</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <source>Air Temperature</source>
+        <translation>Hava Sıcaklığı</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <source>Water Temperature</source>
+        <translation>Su Sıcaklığı</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <source>Dive Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <source>Salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <source>Stats</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <source>Temperature</source>
+        <translation>Sıcaklık</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <source>Total Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <source>Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <source>Cylinders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <source>Add Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <source>Weights</source>
+        <translation>Ağırlıklar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
+        <source>Add Weight System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
+        <source>Trip Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <source>Trip Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <source>Save</source>
+        <translation>Kaydet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
+        <source>This dive is being edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
+        <source>unknown</source>
+        <translation>bilinmeyen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>N</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
+        <source>S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
+        <source>W</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <source>Filter</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
+        <source>&amp;File</source>
+        <translation>&amp;Dosya</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Yardım</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
+        <source>New</source>
+        <translation>Yeni</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
+        <source>Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Kaydet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
+        <source>Save</source>
+        <translation>Kaydet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
+        <source>Save as</source>
+        <translation>Farklı kaydet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
+        <source>Close</source>
+        <translation>Kapat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
+        <source>Export &amp;UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Yazdır</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Çıkış</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
+        <source>&amp;Edit Device Names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <source>&amp;Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <source>Info</source>
+        <translation>Bilgi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
+        <source>All</source>
+        <translation>Tümü</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
+        <source>User &amp;Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
+        <source>Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
+        <source>P&amp;lan Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <source>Preferences</source>
+        <translation>Tercihler</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <source>Auto Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <source>Prev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
+        <source>Left</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <source>Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
+        <source>Right</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <source>Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
+        <source>Input Plan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
+        <source>About Subsurface</source>
+        <translation>Subsurface Hakkında</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
+        <source>Open File</source>
+        <translation>Dosya Aç</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <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="276"/>
+        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <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="564"/>
+        <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="566"/>
+        <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="571"/>
+        <source>Save Changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
+        <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="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
+        <source>Save File as</source>
+        <translation>Dosyayı Farklı Kaydet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <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="248"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF dosyaları (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
+        <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="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <source>Defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <source>Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation>Lisan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <source>Lists and Tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <source>Font</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <source>Font size</source>
+        <translation>Yazı tipi boyutu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <source>Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="176"/>
+        <source>Default Dive file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <source>Display Invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="220"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
+        <source>System</source>
+        <translation>Sistem</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <source>Metric</source>
+        <translation>Metrik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <source>Personalize</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
+        <source>meter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <source>feet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <source>psi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Filter</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <source>Pressure</source>
+        <translation>Basınç</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <source>Volume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <source>Temperature</source>
+        <translation>Sıcaklık</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
+        <source>Time units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
+        <source>Ascent/Descent speed denominator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
+        <source>Minutes</source>
+        <translation>Dakika</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
+        <source>Seconds</source>
+        <translation>Saniye</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
+        <source>Show</source>
+        <translation>Göster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
+        <source>Misc</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Tercihler</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
+        <source>GFLow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
+        <source>GFHigh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
+        <source>Restart required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
+        <source>To correctly load a new language you must restart Subsurface.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Open Default Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation>
+    </message>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Önizleme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
+        <source>P&amp;rint</source>
+        <translation>&amp;Yazdır</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Kapat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
+        <source>Print</source>
+        <translation>Yazdır</translation>
+    </message>
+</context>
+<context>
+    <name>PrintLayout</name>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <source>Dive#</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <source>Master</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <source>Location</source>
+        <translation>Konum</translation>
+    </message>
+</context>
+<context>
+    <name>PrintOptions</name>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
+        <source>Print options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
+        <source>Print only selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
+        <source>Print in color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
+        <source>Print type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
+        <source>6 dives per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
+        <source>2 dives per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
+        <source>Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
+        <source>Ordering</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
+        <source>Profile on top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
+        <source>Notes on top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
+        <source>Sizing heights (% of layout)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
+        <source>Profile height (43% - 85%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
+        <source>Other data height (8% - 17%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
+        <source>Notes height (0% - 52%)</source>
+        <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>0</translation>
+    </message>
+</context>
+<context>
+    <name>ProfilePrintModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
+        <source>unknown</source>
+        <translation>bilinmeyen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
+        <source>Dive #%1 - %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
+        <source>Max depth: %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
+        <source>Duration: %1 min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <source>Gas Used:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
+        <source>SAC:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
+        <source>Max. CNS:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
+        <source>Weights:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
+        <source>Notes:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
+        <source>Divemaster:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <source>Buddy:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <source>Suit:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <source>Viz:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <source>Rating:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
+        <source>AIR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <source>Close</source>
+        <translation>Kapat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Ortalama</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Asgari</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Azami</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RenumberDialog</name>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="14"/>
+        <source>Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/renumber.ui" line="31"/>
+        <source>New starting number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShiftTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="37"/>
+        <source>Shift times of selected dives by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="73"/>
+        <source>h:mm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="83"/>
+        <source>earlier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>later</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceAbout</name>
+    <message>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation>Subsurface Hakkında</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="80"/>
+        <source>&amp;License</source>
+        <translation>&amp;Lisans</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="87"/>
+        <source>&amp;Website</source>
+        <translation>&amp;Website</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Kapat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <source>Webservice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
+        <source>Connection Error: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <source>Invalid user identifier!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Cannot parse response!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
+        <source>Download Success!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <location filename="../qt-ui/tableview.cpp" line="23"/>
+        <source>Add Cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TankInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>ml</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="835"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ToolTipItem</name>
+    <message>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WSInfoModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="706"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+</context>
+<context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Webservice Connection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="25"/>
+        <source>Status:</source>
+        <translation>Durum:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="32"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
+        <source>User ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
+        <source>Upload</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WeightModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Type</source>
+        <translation>Tür</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="356"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="416"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="441"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="442"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="465"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="466"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+</context>
+<context>
+    <name>YearlyStatisticsModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <source>Year 
+ &gt; Month / Trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
+        <source>Duration 
+ Total</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
+        <source>
+Average</source>
+        <translation>
+Ortalama</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
+        <source>
+Shortest</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
+        <source>
+Longest</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
+        <source>Depth (%1)
+ Average</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
+        <source>
+Minimum</source>
+        <translation>
+Asgari</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
+        <source>
+Maximum</source>
+        <translation>
+Azami</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
+        <source>SAC (%1)
+ Average</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
+        <source>Temp. (%1)
+ Average</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>gettextFromC</name>
+    <message>
+        <location filename="../dive.c" line="57"/>
+        <source>pascal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="62"/>
+        <location filename="../qt-gui.cpp" line="348"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="66"/>
+        <location filename="../qt-gui.cpp" line="351"/>
+        <source>psi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="103"/>
+        <location filename="../qt-gui.cpp" line="327"/>
+        <source>l</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="108"/>
+        <location filename="../qt-gui.cpp" line="332"/>
+        <source>cuft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="137"/>
+        <location filename="../qt-gui.cpp" line="232"/>
+        <location filename="../qt-gui.cpp" line="247"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="142"/>
+        <location filename="../qt-gui.cpp" line="235"/>
+        <location filename="../qt-gui.cpp" line="249"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="258"/>
+        <location filename="../qt-gui.cpp" line="268"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="191"/>
+        <location filename="../qt-gui.cpp" line="256"/>
+        <location filename="../qt-gui.cpp" line="266"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="1104"/>
+        <source>(%s) or (%s)</source>
+        <translation>(%s) veya (%s)</translation>
+    </message>
+    <message>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
+        <source>air</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="170"/>
+        <source>integrated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="171"/>
+        <source>belt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="172"/>
+        <source>ankle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="173"/>
+        <source>backplate weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../equipment.c" line="174"/>
+        <source>clip-on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
+        <source>Failed to read &apos;%s&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
+        <source>Maximum number of supported columns on CSV import is %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>none</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>deco stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>rbt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="139"/>
+        <source>workload</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>transmitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>violation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="140"/>
+        <source>safety stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>gaschange</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (voluntary)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="141"/>
+        <source>safety stop (mandatory)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>deepstop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>ceiling (safety stop)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <source>divetime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="142"/>
+        <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="143"/>
+        <source>maxdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>OLF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>airtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>rgbm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="143"/>
+        <source>heading</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>tissue level warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="144"/>
+        <source>non stop time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="161"/>
+        <source>invalid event number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="403"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="409"/>
+        <source>Error registering the data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="417"/>
+        <source>Error parsing the datetime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="433"/>
+        <source>Dive %d: %s %d %04d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="438"/>
+        <source>Error parsing the divetime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="447"/>
+        <source>Error parsing the maxdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="456"/>
+        <source>Error parsing the gas mix count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="468"/>
+        <source>Error obtaining water salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="476"/>
+        <source>Error obtaining surface pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="484"/>
+        <source>Error parsing the gas mix</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="491"/>
+        <source>Error parsing the samples</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="621"/>
+        <source>Event: waiting for user action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="629"/>
+        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="689"/>
+        <source>Error registering the event handler.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="694"/>
+        <source>Error registering the cancellation handler.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="715"/>
+        <source>Dive data import error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="754"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="761"/>
+        <source>Unable to open %s %s (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="484"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1625"/>
+        <source>Failed to parse '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1626"/>
+        <source>Failed to parse &apos;%s&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1845"/>
+        <source>Database query get_events failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
+        <source>Database connection failed '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
+        <source>Database query failed '%s'.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <source>Can&apos;t open stylesheet %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
+        <source>EAN%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="132"/>
+        <source>Can&apos;t find gas %d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="324"/>
+        <source>Too many gas mixes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="504"/>
+        <source>%s
+Subsurface dive plan
+based on GFlow = %.0f and GFhigh = %.0f
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="545"/>
+        <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="554"/>
+        <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="565"/>
+        <source>Switch gas to %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="573"/>
+        <source>Gas consumption:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="584"/>
+        <source>%.0f%s of %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="783"/>
+        <source>ean</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1234"/>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1238"/>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1247"/>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
+        <source>%sT: %d:%02d min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
+        <source>%s %sD:%.1f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1430"/>
+        <source>%s %sD:%.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1434"/>
+        <source>%s%sV:%.2f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
+        <source>%s %sV:%.2f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1449"/>
+        <source>%s %sP:%d %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="308"/>
+        <source>C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="311"/>
+        <source>F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="498"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="511"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="524"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="529"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>boat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>shore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
+        <source>drift</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>deep</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>cavern</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="14"/>
+        <source>ice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>wreck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>cave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="15"/>
+        <source>altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>pool</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>lake</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="16"/>
+        <source>river</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>night</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
+        <source>deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="216"/>
+        <source>more than %d days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="222"/>
+        <source>%dd %dh %dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dh %dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="235"/>
+        <source>for dives #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="242"/>
+        <source>for selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="277"/>
+        <source>for dive #%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="279"/>
+        <source>for selected dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="281"/>
+        <source>for all dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="283"/>
+        <source>(no dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sun</source>
+        <translation>Pazar</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Mon</source>
+        <translation>Pazartesi</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Tue</source>
+        <translation>Salı</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Wed</source>
+        <translation>Çarşamba</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Thu</source>
+        <translation>Perşembe</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Fri</source>
+        <translation>Cuma</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="63"/>
+        <source>Sat</source>
+        <translation>Cumartesi</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jan</source>
+        <translation>Ocak</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Feb</source>
+        <translation>Şubat</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Mar</source>
+        <translation>Mart</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Apr</source>
+        <translation>Nisan</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>May</source>
+        <translation>Mayıs</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="72"/>
+        <source>Jun</source>
+        <translation>Haziran</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Jul</source>
+        <translation>Temmuz</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Aug</source>
+        <translation>Ağustos</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Sep</source>
+        <translation>Eylül</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Oct</source>
+        <translation>Ekim</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Nov</source>
+        <translation>Kasım</translation>
+    </message>
+    <message>
+        <location filename="../subsurfacestartup.c" line="73"/>
+        <source>Dec</source>
+        <translation>Aralık</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="24"/>
+        <source>Uemis Zurich: File System is almost full
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="107"/>
+        <source>unknown</source>
+        <translation>bilinmeyen</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="379"/>
+        <source>Reading %s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="399"/>
+        <source>data</source>
+        <translation>veri</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>divelog entry id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="422"/>
+        <source>divespot data id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="424"/>
+        <source>more data dive id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>wetsuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>semidry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="618"/>
+        <source>drysuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>vest</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>long john</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>jacket</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>full suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="619"/>
+        <source>2 pcs full suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="620"/>
+        <source>membrane</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="802"/>
+        <source>Init Communication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="804"/>
+        <source>Uemis init failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="815"/>
+        <source>Start download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="196"/>
+        <source>Safety Stop Violation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="198"/>
+        <source>Speed Alarm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="201"/>
+        <source>Speed Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="203"/>
+        <source>PO2 Green Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="206"/>
+        <source>PO2 Ascend Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="208"/>
+        <source>PO2 Ascend Alarm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="212"/>
+        <source>Tank Pressure Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="214"/>
+        <source>RGT Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="216"/>
+        <source>RGT Alert</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="218"/>
+        <source>Tank Change Suggested</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="220"/>
+        <source>Depth Limit Exceeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="222"/>
+        <source>Max Deco Time Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="224"/>
+        <source>Dive Time Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="226"/>
+        <source>Dive Time Alert</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="228"/>
+        <source>Marker</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="230"/>
+        <source>No Tank Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="232"/>
+        <source>Low Battery Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis.c" line="234"/>
+        <source>Low Battery Alert</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index abc414b3e..911d69114 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -1,153 +1,75 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="vi" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>Thời gian</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>Độ sâu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>Nhiệt độ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>Kích thước</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
-        <translation type="unfinished"/>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
-        <translation type="unfinished"/>
+        <translation>cuft</translation>
     </message>
 </context>
 <context>
@@ -172,35 +94,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>Mô hình</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>Tên</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>không khí</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>Thoát đến OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>bắt đầu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>không khí</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -208,107 +173,266 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>Độ sâu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>Thời gian</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>Nhiệt độ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <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"/>
+        <source>Metric</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>Ngày tháng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>Bạn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>Ghi chú</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>Cân nặng</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="85"/>
@@ -344,22 +468,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
         <translation type="unfinished"/>
@@ -368,37 +492,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>KHÔNG KHÍ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -406,85 +530,158 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>Thời gian</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>Áp suất</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>Nhiệt độ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>nhỏ nhất</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>ký</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>ký</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>CNS tối đa</translation>
     </message>
@@ -492,114 +689,114 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -607,48 +804,54 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>Lỗi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>Thử lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <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="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -716,7 +919,7 @@ Please, remove them first.</source>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation type="unfinished"/>
     </message>
@@ -725,13 +928,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <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="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
@@ -757,11 +960,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation type="unfinished"/>
     </message>
@@ -787,7 +992,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
@@ -898,92 +1103,102 @@ Please, remove them first.</source>
         <translation>Lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Xilanh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>Lưu lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -991,428 +1206,518 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>Bộ lọc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>Mới</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>Lưu lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>Lưu dưới dạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>Đóng lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
-        <source>Ctrl+U</source>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
-        <source>&amp;Print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
-        <source>Ctrl+,</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
+        <source>Ctrl+U</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>Hồ sơ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>Thông tin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>Tùy biến</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>DC trước</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>DC tiếp theo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>Chọn sự kiện</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>Nhập vào kế hoạch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>Thông tin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>Mở tập tin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>Hướng dẫn sử dụng</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>Lưu các thay đổi?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <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="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>Thống kê từng năm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1482,209 +1787,187 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>Bộ lọc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>Áp suất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1694,37 +1977,32 @@ Please, remove them first.</source>
         <translation>Tùy biến</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1732,22 +2010,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1870,216 +2148,116 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>Chỉnh sửa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>không khí</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>Thoát đến OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>bắt đầu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>kết thúc</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <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="36"/>
         <source>AIR</source>
         <translation>KHÔNG KHÍ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation type="unfinished"/>
     </message>
@@ -2089,22 +2267,22 @@ Please, remove them first.</source>
         <translation>Đóng lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Trung bình</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Tối đa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -2122,6 +2300,59 @@ Please, remove them first.</source>
         <translation>Số bắt đầu mới</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2158,20 +2389,25 @@ Please, remove them first.</source>
         <translation>Thông tin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2181,37 +2417,37 @@ Please, remove them first.</source>
         <translation>Dịch vụ web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>Đang kết nối...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>Lỗi kết nối:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <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="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>Không nhận được trả lời!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>Tải về thành công!</translation>
     </message>
@@ -2227,17 +2463,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2245,20 +2481,33 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>Hướng dẫn sử dụng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
@@ -2281,32 +2530,32 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>Số hiệu người dùng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>Mật khẩu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation type="unfinished"/>
     </message>
@@ -2314,108 +2563,108 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
-        <translation type="unfinished"/>
+        <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
-        <translation type="unfinished"/>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -2430,25 +2679,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2481,17 +2730,17 @@ Maximum</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) hoặc (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>không khí</translation>
     </message>
@@ -2523,20 +2772,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Thất bại khi đọc dữ liệu &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -2678,17 +2923,17 @@ Maximum</source>
         <translation>chỉ số sự kiện không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <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="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>Lỗi khi đăng ký dữ liệu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>Lỗi khi chuyển thông số thời gian</translation>
     </message>
@@ -2703,133 +2948,158 @@ Maximum</source>
         <translation>Lỗi khi chuyển thông số thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <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="456"/>
         <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="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>Lỗi khi thu nhận độ mặn của nước</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <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="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <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="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <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="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <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="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <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="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <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="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <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="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <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="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Đang đọc tỉ lệ lạ %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>Thất bại khi chuyển thông số &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <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="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <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="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>Thất bại khi kết nối cơ sở dữ liệu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <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="1917"/>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>Không tìm thấy dưỡng khí %d%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>Quá nhiều dưỡng khí được trộn</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2842,264 +3112,260 @@ dựa trên GFlow = %.0f và GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>Chuyển dưỡng khí sang %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>Dưỡng khí tiêu thụ:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s of %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
+        <location filename="../profile.c" line="1234"/>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
+        <location filename="../profile.c" line="1238"/>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1247"/>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-Trần đã tính toán %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
+        <source>Calculated ceiling %.0f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-Dừng an toàn:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-Dừng an toàn:chưa rõ thời gian @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco:chưa rõ thời gian @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-Trong deco</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
@@ -3199,142 +3465,142 @@ TTS:%umin (calc)</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>đã hơn %d ngày</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>cho các lần lặn #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>cho các lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>cho lần lặn #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>cho lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>cho mọi lần lặn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(không có cuộc lặn nào)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>CN</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>T2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>T3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>T4</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>T5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>T6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>T7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>Th1</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>Th2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>Th3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>Th5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>Th6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>Th7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>Th8</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>Th9</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>Th10</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>Th11</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>Th12</translation>
     </message>
@@ -3364,187 +3630,187 @@ 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="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>Đang đọc %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>dữ liệu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>số dòng nhật trình lặn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>số dữ liệu điểm lặn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <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="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>ít ướt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>đồ khô</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>ngắn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>áo khoác</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>thiết bị đầy đủ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2 bộ pcs đầy đủ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>lớp màng</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>Thiết lập giao tiếp</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <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="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>Bắt đầu tải xuống</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>Dừng độ vi phạm an toàn</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>Báo động tốc độ</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>Cảnh báo tốc độ</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>Cảnh báo PO2 xanh</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>Cảnh báo PO2 cao</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>Cảnh báo PO2 cao</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>Thông tin áp suất bể nước</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>Cảnh báo RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>Cảnh báo RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>Đề nghị thay đổi bể nước</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>Giới hạn độ sâu cho phép</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>Cảnh báo thời gian tối đa Deco</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>Thông tin về thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>Cảnh báo thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>Người đánh dấu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>Không có dữ liệu bồn nước</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>Cảnh báo năng lượng yếu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>Cảnh báo năng lượng yếu</translation>
     </message>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index 89eb644c3..9b9919069 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -1,151 +1,73 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
-<context>
-    <name>CSVImportDialog</name>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
-        <source>Import File (CSV)</source>
-        <translation>匯入檔案 (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
-        <source>Field Separator</source>
-        <translation>欄位分隔線</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
-        <source>Field Configuration</source>
-        <translation>欄位設定</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Import CSV file</source>
-        <translation>匯入 CSV 檔案</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
-        <source>Time</source>
-        <translation>時間</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
-        <source>Depth</source>
-        <translation>深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
-        <source>Temp</source>
-        <translation>溫度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
-        <source>Stopdepth</source>
-        <translation>停留深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
-        <source>Pre-configured imports</source>
-        <translation>未設定前的匯入</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>Open CSV Log File</source>
-        <translation>開啟 CSV 日誌檔案</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
-        <source>CSV Files (*.csv);;All Files(*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
         <translation>容量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
         <translation>工作壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
         <translation>開始壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
         <translation>結束壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
-        <source>Switch at</source>
-        <translation>交換於</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="68"/>
+        <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="151"/>
+        <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="331"/>
+        <location filename="../qt-ui/models.cpp" line="341"/>
         <source>Cylinder cannot be removed</source>
         <translation>氣瓶無法移除</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="332"/>
+        <location filename="../qt-ui/models.cpp" line="342"/>
         <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="478"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="512"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -173,35 +95,78 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Model</source>
         <translation>型號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Device ID</source>
         <translation>裝置 ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1298"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Nickname</source>
         <translation>別名</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1444"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>於此處按下將會移除此潛水電腦.</translation>
     </message>
 </context>
+<context>
+    <name>DiveEventItem</name>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+        <source>air</source>
+        <translation>air</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+        <source>Bailing out to OC</source>
+        <translation>跳脫至 OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+        <source> begin</source>
+        <comment>Starts with space!</comment>
+        <translation>開始</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+        <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="456"/>
+        <source>air</source>
+        <translation>air</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+        <source>EAN%1</source>
+        <translation>EAN%1</translation>
+    </message>
+</context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1241"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -209,101 +174,260 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="43"/>
+        <location filename="../qt-ui/divelistview.cpp" line="48"/>
         <source>Show Search Box</source>
         <translation>顯示搜尋盒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="706"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>collapse all</source>
         <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="712"/>
         <source>collapse others</source>
         <translation>摺疊其它</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>remove dive(s) from trip</source>
         <translation>自旅程中移除潛水 (多筆)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="710"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>create new trip above</source>
         <translation>於上方新增旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>新增潛水 (所選) 至旅程上方.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="719"/>
         <source>merge trip with trip above</source>
         <translation>與上方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>merge trip with trip below</source>
         <translation>與下方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="719"/>
+        <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>delete dive(s)</source>
         <translation>刪除潛水 (所選)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="721"/>
+        <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>mark dive(s) invalid</source>
         <translation>標示無效的潛水 (所選)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="727"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>save As</source>
         <translation>另存為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="733"/>
         <source>export As UDDF</source>
         <translation>匯出成 UDDF </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="729"/>
+        <location filename="../qt-ui/divelistview.cpp" line="734"/>
         <source>shift times</source>
         <translation>移動時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>upload dive(s) to divelogs.de</source>
         <translation>上傳潛水 (所選) 至 divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="758"/>
+        <location filename="../qt-ui/divelistview.cpp" line="764"/>
         <source>Save Dives As...</source>
         <translation>儲存潛水為...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="777"/>
+        <location filename="../qt-ui/divelistview.cpp" line="783"/>
         <source>Save File as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="778"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF 檔案 (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="725"/>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="801"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="730"/>
         <source>merge selected dives</source>
         <translation>合併所選擇的潛水</translation>
     </message>
 </context>
+<context>
+    <name>DiveLogImportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <source>Import dive log file</source>
+        <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"/>
+        <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"/>
+        <source>Field Separator</source>
+        <translation>欄位分隔線</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <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"/>
+        <source>Field Configuration</source>
+        <translation>欄位設定</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <source>Depth</source>
+        <translation>深度</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <source>Stopdepth</source>
+        <translation>停留深度</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <source>Time</source>
+        <translation>時間</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <source>Temp</source>
+        <translation>溫度</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <source>Cns</source>
+        <translation>Cns</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <source>Units</source>
+        <translation>單位</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <source>Metric</source>
+        <translation>公制</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <source>Imperial</source>
+        <translation>英制</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <source>Manual dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <source>Duration</source>
+        <translation>區間</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <source>Location</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <source>Gps</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <source>Buddy</source>
+        <translation>潛伴</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <source>Notes</source>
+        <translation>記錄</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <source>Weight</source>
+        <translation>重量</translation>
+    </message>
+</context>
 <context>
     <name>DivePlanner</name>
     <message>
@@ -345,22 +469,22 @@
 <context>
     <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="117"/>
         <source>10m</source>
         <translation>10m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="119"/>
         <source>30ft</source>
         <translation>30ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
         <source>Handler Position Error</source>
         <translation>程式位置錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="365"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
         <translation>在這次流程, 有一或多個停留將會被跳過, 
@@ -370,37 +494,37 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="446"/>
         <source>AIR</source>
         <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
         <source>Final Depth</source>
         <translation>最後深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
         <source>Used Gas</source>
         <translation>已使用的氣體</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
         <source>CC Set Point</source>
         <translation>密閉式循環設定點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
         <source>Discard the Plan?</source>
         <translation>取消這次計畫?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
         <source>You are about to discard your plan.</source>
         <translation>您將要放棄你的計劃.</translation>
     </message>
@@ -408,85 +532,158 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="933"/>
         <source>Dive Planner Points</source>
         <translation>潛水計畫指示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="936"/>
         <source>Available Gases</source>
         <translation>可用氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
         <translation>新增潛水資料點</translation>
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
+    <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1202"/>
-        <source>#</source>
-        <translation>#</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+        <source>Depth</source>
+        <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1203"/>
-        <source>date</source>
-        <translation>日期</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+        <source>Time</source>
+        <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+        <source>Pressure</source>
+        <translation>壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1205"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+        <source>Temperature</source>
+        <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1206"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <source>Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <source>User Entered</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1208"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <source>Cylinder Index</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1209"/>
-        <source>suit</source>
-        <translation>防寒衣</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure  S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1210"/>
-        <source>cyl</source>
-        <translation>氣瓶</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1215"/>
-        <source>location</source>
-        <translation>位置</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1212"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>PN2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+</context>
+<context>
+    <name>DiveTripModel</name>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1288"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1291"/>
+        <source>date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1297"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1300"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <source>suit</source>
+        <translation>防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1312"/>
+        <source>cyl</source>
+        <translation>氣瓶</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>location</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <source>SAC</source>
+        <translation>耗氣率</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1214"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>maxCNS</source>
         <translation>最大 CNS</translation>
     </message>
@@ -494,115 +691,115 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
         <source>Invalid response from server</source>
         <translation>主機回傳不正確的回應.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <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="534"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
         <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="541"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>異常的 XML 回應. 第 %1 行: %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
         <source>no dives were selected</source>
-        <translation type="unfinished"/>
+        <translation>未選取任何潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
         <source>failed to create zip file for upload: %1</source>
-        <translation type="unfinished"/>
+        <translation>建立上傳的壓縮檔案失敗: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
         <source>cannot create temporary file: %1</source>
-        <translation type="unfinished"/>
+        <translation>無法建立暫存檔案: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
         <source>internal error: %1</source>
-        <translation type="unfinished"/>
+        <translation>內部錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
         <source>internal error</source>
-        <translation type="unfinished"/>
+        <translation>內部錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
         <source>Uploading dive list...</source>
         <translation>上傳潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
         <source>Downloading dive list...</source>
         <translation>下載潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
         <source>Downloading %1 dives...</source>
         <translation>下載 %1 潛水...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
         <source>Download finished - %1</source>
         <translation>下載結束 - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
         <source>Corrupted download</source>
         <translation>中斷下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>此存檔無法被開啟:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>Upload failed</source>
         <translation>上傳失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
         <source>Upload successful</source>
         <translation>上傳成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
         <source>Login failed</source>
         <translation>登入失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
         <source>Cannot parse response</source>
         <translation>回覆無法解析</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
         <source>Error: %1</source>
         <translation>錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
         <source>Upload finished</source>
         <translation>上傳結束</translation>
     </message>
@@ -610,50 +807,56 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>OK</source>
         <translation>確認</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
         <source>Retry</source>
         <translation>重試</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+        <source>Find Uemis dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
         <source>Choose file for divecomputer download logfile</source>
-        <translation type="unfinished"/>
+        <translation>選擇記錄檔供潛水電腦下載日誌檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Log files (*.log)</source>
-        <translation type="unfinished"/>
+        <translation>記錄檔 (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
-        <translation type="unfinished"/>
+        <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer binary dump file</source>
-        <translation type="unfinished"/>
+        <translation>選擇檔案供潛水電腦記錄傾印資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Dump files (*.bin)</source>
-        <translation type="unfinished"/>
+        <translation>傾印檔 (*bin)</translation>
     </message>
 </context>
 <context>
@@ -708,18 +911,18 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
         <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
+        <translation>儲存 libdivecomputer 日誌檔案</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"/>
+        <translation>儲存 libdivecomputer 傾印檔案</translation>
     </message>
 </context>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="100"/>
+        <location filename="../qt-ui/globe.cpp" line="103"/>
         <source>Edit Selected Dive Locations</source>
         <translation>編輯所選擇的潛水位置</translation>
     </message>
@@ -728,13 +931,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="431"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>Dive Notes</source>
         <translation>潛水記錄</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="455"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
@@ -760,11 +963,13 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="235"/>
         <source>Air temp</source>
         <translation>氣溫</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="236"/>
         <source>Water temp</source>
         <translation>水溫</translation>
     </message>
@@ -790,7 +995,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="456"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -901,92 +1106,102 @@ Please, remove them first.</source>
         <translation>潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="76"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>新增氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>配重</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="80"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>增加配重系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="424"/>
+        <location filename="../qt-ui/maintab.cpp" line="437"/>
         <source>Trip Location</source>
         <translation>旅程位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="402"/>
-        <location filename="../qt-ui/maintab.cpp" line="426"/>
+        <location filename="../qt-ui/maintab.cpp" line="415"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
         <source>Trip Notes</source>
         <translation>旅程記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="39"/>
+        <location filename="../qt-ui/maintab.cpp" line="42"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="43"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="232"/>
+        <source>Air temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <source>Water temp [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>This trip is being edited.</source>
         <translation>此旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="250"/>
+        <location filename="../qt-ui/maintab.cpp" line="264"/>
         <source>Multiple dives are being edited.</source>
         <translation>此些旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="266"/>
         <source>This dive is being edited.</source>
         <translation>此潛水已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="478"/>
-        <location filename="../qt-ui/maintab.cpp" line="486"/>
-        <location filename="../qt-ui/maintab.cpp" line="515"/>
-        <location filename="../qt-ui/maintab.cpp" line="516"/>
-        <location filename="../qt-ui/maintab.cpp" line="517"/>
+        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.cpp" line="528"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
+        <location filename="../qt-ui/maintab.cpp" line="530"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
+        <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="1006"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="990"/>
+        <location filename="../qt-ui/maintab.cpp" line="1007"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -994,428 +1209,518 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="184"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="143"/>
+        <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <source>&amp;File</source>
         <translation>檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>&amp;Log</source>
         <translation>日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../qt-ui/mainwindow.ui" line="578"/>
         <source>&amp;View</source>
         <translation>檢視</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="190"/>
+        <location filename="../qt-ui/mainwindow.ui" line="600"/>
         <source>&amp;Help</source>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../qt-ui/mainwindow.ui" line="607"/>
         <source>&amp;Import</source>
         <translation>匯入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="214"/>
+        <location filename="../qt-ui/mainwindow.ui" line="623"/>
         <source>&amp;New logbook</source>
         <translation>建立新日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="217"/>
+        <location filename="../qt-ui/mainwindow.ui" line="626"/>
         <source>New</source>
         <translation>建立</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="220"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
+        <location filename="../qt-ui/mainwindow.ui" line="634"/>
         <source>&amp;Open logbook</source>
         <translation>開啟日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="228"/>
+        <location filename="../qt-ui/mainwindow.ui" line="637"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="236"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
         <source>&amp;Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="239"/>
+        <location filename="../qt-ui/mainwindow.ui" line="648"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="651"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="247"/>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../qt-ui/mainwindow.ui" line="656"/>
+        <location filename="../qt-ui/mainwindow.ui" line="659"/>
         <source>Save as</source>
         <translation>另存為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="662"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
+        <location filename="../qt-ui/mainwindow.ui" line="670"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="673"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="172"/>
-        <source>Import Files</source>
-        <translation>匯入檔案</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="275"/>
+        <location filename="../qt-ui/mainwindow.ui" line="865"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="678"/>
         <source>Export &amp;UDDF</source>
         <translation>匯出 UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="283"/>
+        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <source>Enable the pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <source>Enable the pHe graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <source>Enable EAD, END, and EADD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <source>Show NDL / TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="686"/>
         <source>&amp;Print</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="697"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>&amp;Quit</source>
         <translation>結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="716"/>
         <source>Import from &amp;dive computer</source>
         <translation>從潛水電腦匯入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>自 Subsurface 服務匯入 GPS 資料</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="727"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="334"/>
+        <location filename="../qt-ui/mainwindow.ui" line="732"/>
         <source>&amp;Edit Device Names</source>
         <translation>編輯裝置名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="740"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
+        <location filename="../qt-ui/mainwindow.ui" line="745"/>
         <source>&amp;Renumber</source>
         <translation>重新編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="350"/>
+        <location filename="../qt-ui/mainwindow.ui" line="748"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="363"/>
-        <source>Toggle &amp;Zoom</source>
-        <translation>變焦切換</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>&amp;Yearly Statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
         <source>Dive List</source>
         <translation>潛水列表</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Profile</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../qt-ui/mainwindow.ui" line="785"/>
         <source>Info</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../qt-ui/mainwindow.ui" line="793"/>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="442"/>
+        <location filename="../qt-ui/mainwindow.ui" line="835"/>
         <source>User &amp;Manual</source>
         <translation>使用者說明</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="450"/>
+        <location filename="../qt-ui/mainwindow.ui" line="843"/>
         <source>Globe</source>
         <translation>地圖位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../qt-ui/mainwindow.ui" line="851"/>
         <source>P&amp;lan Dive</source>
         <translation>計畫潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="461"/>
+        <location filename="../qt-ui/mainwindow.ui" line="854"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="466"/>
-        <source>Import CSV</source>
-        <translation>匯入 CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="469"/>
-        <source>Import CS&amp;V</source>
-        <translation>匯入 CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../qt-ui/mainwindow.ui" line="870"/>
         <source>Import from Divelogs.de</source>
         <translation>自 Divelogs.de 匯入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="291"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <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"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <source>Enable MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <source>Show the DC Reported Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <source>Show the Calculated Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <source>Show Calculated Ceiling with 3m Increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>Calculate All Tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Show SAC Rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Enable / Disable the Ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
         <source>Preferences</source>
         <translation>環境設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="708"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="339"/>
+        <location filename="../qt-ui/mainwindow.ui" line="737"/>
         <source>Add Dive</source>
         <translation>增加潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="358"/>
+        <location filename="../qt-ui/mainwindow.ui" line="756"/>
         <source>Auto Group</source>
         <translation>增加群組</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="379"/>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="387"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="395"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../qt-ui/mainwindow.ui" line="796"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Prev DC</source>
         <translation>上一個 DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="411"/>
+        <location filename="../qt-ui/mainwindow.ui" line="804"/>
         <source>Left</source>
         <translation>左邊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../qt-ui/mainwindow.ui" line="809"/>
         <source>Next DC</source>
         <translation>下一個 DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../qt-ui/mainwindow.ui" line="812"/>
         <source>Right</source>
         <translation>右邊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="424"/>
+        <location filename="../qt-ui/mainwindow.ui" line="817"/>
         <source>Select Events</source>
         <translation>選擇事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="429"/>
+        <location filename="../qt-ui/mainwindow.ui" line="822"/>
         <source>Input Plan</source>
         <translation>輸入計畫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="434"/>
+        <location filename="../qt-ui/mainwindow.ui" line="827"/>
         <source>About Subsurface</source>
         <translation>關於 Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="445"/>
+        <location filename="../qt-ui/mainwindow.ui" line="838"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="453"/>
+        <location filename="../qt-ui/mainwindow.ui" line="846"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <source>Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="862"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="878"/>
+        <source>&amp;Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="881"/>
+        <source>Toggle Full Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="884"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="143"/>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
         <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="228"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
         <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="291"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
         <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="503"/>
-        <source>User Manual</source>
-        <translation>使用者說明</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="507"/>
-        <source>Cannot find the Subsurface manual</source>
-        <translation>無法找到 Subsurface 使用說明</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="564"/>
         <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="546"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="566"/>
         <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="551"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="571"/>
         <source>Save Changes?</source>
         <translation>儲存變更?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="572"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>如果不進行儲存, 所做變更將會遺失.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
-        <source>First finish the current edition before trying to do another.</source>
-        <translation>在做另一編輯前, 請先結束此次編輯.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="201"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="870"/>
         <source>Save File as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="149"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="228"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="291"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="709"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="140"/>
         <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="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="248"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF 檔案 (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+        <source>Yearly Statistics</source>
+        <translation>年統計</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="871"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <source>Open Dive Log File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+        <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="1013"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -1485,209 +1790,187 @@ Please, remove them first.</source>
         <translation>使用的預設氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="256"/>
+        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <source>Animations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <source>Speed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="289"/>
         <source>System</source>
         <translation>系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Metric</source>
         <translation>公制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../qt-ui/preferences.ui" line="316"/>
         <source>Personalize</source>
         <translation>個人化</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="307"/>
+        <location filename="../qt-ui/preferences.ui" line="340"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="314"/>
+        <location filename="../qt-ui/preferences.ui" line="347"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="324"/>
+        <location filename="../qt-ui/preferences.ui" line="357"/>
         <source>feet</source>
         <translation>feet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <location filename="../qt-ui/preferences.ui" line="374"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="384"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="401"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="411"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <location filename="../qt-ui/preferences.ui" line="428"/>
         <source>celsius</source>
         <translation>攝氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>fahrenheit</source>
         <translation>華氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="510"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="523"/>
+        <source>Show units in text labels</source>
+        <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="551"/>
-        <source>pN₂</source>
-        <translation>pN₂</translation>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
+        <source>threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="581"/>
+        <source>threshold when showing pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <source>threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <source>max ppO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="644"/>
+        <source>draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="655"/>
+        <source>unused tanks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>System Default</source>
         <translation>系統預設</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <location filename="../qt-ui/preferences.ui" line="367"/>
         <source>Pressure</source>
         <translation>壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
         <source>Volume</source>
         <translation>容量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <location filename="../qt-ui/preferences.ui" line="421"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="448"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="465"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>Time units</source>
         <translation>時間單位</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="453"/>
+        <location filename="../qt-ui/preferences.ui" line="486"/>
         <source>Ascent/Descent speed denominator</source>
         <translation>上升/下降速度單位</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="493"/>
         <source>Minutes</source>
         <translation>分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="470"/>
+        <location filename="../qt-ui/preferences.ui" line="503"/>
         <source>Seconds</source>
         <translation>秒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="502"/>
+        <location filename="../qt-ui/preferences.ui" line="549"/>
         <source>Show</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="574"/>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
-        <source>threshold</source>
-        <translation>門檻</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="633"/>
-        <source>MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="656"/>
-        <source>max ppO₂</source>
-        <translation>最大 ppO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
-        <source>EAD END EADD</source>
-        <translation>EAD END EADD</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="681"/>
-        <source>Dive computer reported ceiling</source>
-        <translation>潛水電腦回報的深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="704"/>
-        <source>draw ceiling red</source>
-        <translation>以紅色繪製深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="715"/>
-        <source>Calculated ceiling</source>
-        <translation>計算的深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
-        <source>show all tissues</source>
-        <translation>顯示所有組織</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
-        <source>3m increments</source>
-        <translation>3m 增量</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="758"/>
-        <source>Calculate NDL/TTS</source>
-        <translation>計算 NDL/TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="707"/>
         <source>GFLow at max depth</source>
         <translation>最大深度的 GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="781"/>
+        <location filename="../qt-ui/preferences.ui" line="667"/>
         <source>Misc</source>
         <translation>其它</translation>
     </message>
@@ -1697,37 +1980,32 @@ Please, remove them first.</source>
         <translation>環境設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="769"/>
-        <source>SAC</source>
-        <translation>耗氣率</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="673"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="196"/>
+        <location filename="../qt-ui/preferences.cpp" line="219"/>
         <source>Restart required</source>
         <translation>需要重新啟動</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="197"/>
+        <location filename="../qt-ui/preferences.cpp" line="220"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>您必須重新啟動 Subsurface 來正確載入新的語言</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Open Default Log File</source>
         <translation>開啟預設的日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="328"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1735,22 +2013,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Preview</source>
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <location filename="../qt-ui/printdialog.cpp" line="36"/>
         <source>P&amp;rint</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <location filename="../qt-ui/printdialog.cpp" line="40"/>
         <source>&amp;Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="61"/>
+        <location filename="../qt-ui/printdialog.cpp" line="55"/>
         <source>Print</source>
         <translation>列印</translation>
     </message>
@@ -1873,216 +2151,116 @@ Please, remove them first.</source>
         <translation>0</translation>
     </message>
 </context>
-<context>
-    <name>ProfileGraphicsView</name>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
-        <source>Add Gas Change</source>
-        <translation>增加氣瓶交換</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
-        <source>Add Bookmark</source>
-        <translation>增加書籤</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
-        <source>Remove Event</source>
-        <translation>移除事件</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
-        <source>Hide similar events</source>
-        <translation>隱藏相似事件</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
-        <source>Unhide all events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
-        <source>Hide events</source>
-        <translation>隱藏事件</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
-        <source>Hide all %1 events?</source>
-        <translation>隱藏所有 %1 事件?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
-        <source>Remove the selected event?</source>
-        <translation>移除所選擇的事件？</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
-        <source>%1 @ %2:%3</source>
-        <translation>%1 @ %2:%3</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
-        <source>unknown divecomputer</source>
-        <translation>未知的潛水電腦</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
-        <source>Set Duration: 10 minutes</source>
-        <translation>設定區間: 10 分鐘</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
-        <source>Scale</source>
-        <translation>比例</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
-        <source>Ruler</source>
-        <translation>尺規</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
-        <source>Measure properties of dive segments</source>
-        <translation>各潛水項目的量測設定</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
-        <source>Scale your dive to screen size</source>
-        <translation>調整潛水至螢幕大小</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
-        <source>Edit</source>
-        <translation>編輯</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
-        <source>pN</source>
-        <translation>pN</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
-        <source>pHe</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
-        <source>pO</source>
-        <translation>pO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
-        <source>Bailing out to OC</source>
-        <translation>跳脫至 OC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation>開始</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation>結束</translation>
-    </message>
-</context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1881"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1676"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Dive #%1 - %2</source>
         <translation>潛水 #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1679"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>Max depth: %1 %2</source>
         <translation>最大深度: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1896"/>
         <source>Duration: %1 min</source>
         <translation>區間: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1691"/>
+        <location filename="../qt-ui/models.cpp" line="1901"/>
         <source>Gas Used:</source>
         <translation>消耗氣體: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1693"/>
+        <location filename="../qt-ui/models.cpp" line="1903"/>
         <source>SAC:</source>
         <translation>耗氣率: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1905"/>
         <source>Max. CNS:</source>
         <translation>最大 CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1697"/>
+        <location filename="../qt-ui/models.cpp" line="1907"/>
         <source>Weights:</source>
         <translation>配重:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1702"/>
+        <location filename="../qt-ui/models.cpp" line="1912"/>
         <source>Notes:</source>
         <translation>記錄:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1709"/>
+        <location filename="../qt-ui/models.cpp" line="1919"/>
         <source>Divemaster:</source>
         <translation>導潛:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1711"/>
+        <location filename="../qt-ui/models.cpp" line="1921"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1713"/>
+        <location filename="../qt-ui/models.cpp" line="1923"/>
         <source>Suit:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1715"/>
+        <location filename="../qt-ui/models.cpp" line="1925"/>
         <source>Viz:</source>
         <translation>Viz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1717"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Rating:</source>
         <translation>評分:</translation>
     </message>
 </context>
+<context>
+    <name>ProfileWidget2</name>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+        <source>Add Gas Change</source>
+        <translation>增加氣瓶交換</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+        <source>Add Bookmark</source>
+        <translation>增加書籤</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+        <source>Remove Event</source>
+        <translation>移除事件</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <source>Hide similar events</source>
+        <translation>隱藏相似事件</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+        <source>Unhide all events</source>
+        <translation>取消隱藏所有事件</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="36"/>
         <source>AIR</source>
         <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="706"/>
         <source>Remove this Point</source>
         <translation>移除此點</translation>
     </message>
@@ -2092,22 +2270,22 @@ Please, remove them first.</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>最低</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>最高</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="238"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation>
     </message>
@@ -2125,6 +2303,59 @@ Please, remove them first.</source>
         <translation>新的開始編號</translation>
     </message>
 </context>
+<context>
+    <name>ShiftImageTimesDialog</name>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+        <source>Shift selected times</source>
+        <translation>移動所選擇的時間</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+        <source>Shift times of image(s) by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+        <source>earlier</source>
+        <translation>較早</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+        <source>later</source>
+        <translation>較晚</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+        <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="152"/>
+        <source>Determine camera time offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <source>Select image of divecomputer showing time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <source>Which date and time are displayed on the image?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+        <source>Open Image File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ShiftTimesDialog</name>
     <message>
@@ -2161,20 +2392,25 @@ Please, remove them first.</source>
         <translation>關於 Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="19"/>
-        <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, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;跨平台潛水日誌軟體&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
+        <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
         <translation>版權</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="24"/>
+        <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
         <translation>網站</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/about.ui" line="94"/>
+        <source>&amp;Close</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/about.cpp" line="12"/>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
@@ -2184,37 +2420,37 @@ Please, remove them first.</source>
         <translation>網頁服務</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
         <source>Connecting...</source>
         <translation>連結...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
         <source>Download finished</source>
         <translation>下載結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
         <source>Download error: %1</source>
         <translation>下載失敗: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
         <source>Connection Error: </source>
         <translation>連結錯誤:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Invalid user identifier!</source>
         <translation>錯誤的使用者 Id !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
         <source>Cannot parse response!</source>
         <translation>回覆無法解析!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
         <source>Download Success!</source>
         <translation>下載成功!</translation>
     </message>
@@ -2230,17 +2466,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="824"/>
+        <location filename="../qt-ui/models.cpp" line="835"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2248,20 +2484,33 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
 </context>
+<context>
+    <name>UserManual</name>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="23"/>
+        <source>User Manual</source>
+        <translation>使用者說明</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usermanual.cpp" line="31"/>
+        <source>Cannot find the Subsurface manual</source>
+        <translation>無法找到 Subsurface 使用說明</translation>
+    </message>
+</context>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="696"/>
+        <location filename="../qt-ui/models.cpp" line="706"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2284,32 +2533,32 @@ Please, remove them first.</source>
         <translation>於此處輸入您的 ID </translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="39"/>
+        <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="63"/>
+        <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
         <translation>使用者 ID </translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="80"/>
+        <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="94"/>
+        <location filename="../qt-ui/webservices.ui" line="99"/>
         <source>Upload</source>
         <translation>上傳</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
         <source>Operation timed out</source>
         <translation>操作時間結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
         <source>Transfering data...</source>
         <translation>移轉資料...</translation>
     </message>
@@ -2317,37 +2566,37 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="346"/>
+        <location filename="../qt-ui/models.cpp" line="356"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="416"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>按此處移除配重系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="431"/>
+        <location filename="../qt-ui/models.cpp" line="441"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="432"/>
+        <location filename="../qt-ui/models.cpp" line="442"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="455"/>
+        <location filename="../qt-ui/models.cpp" line="465"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="456"/>
+        <location filename="../qt-ui/models.cpp" line="466"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2355,79 +2604,79 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1474"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>年 
  &gt; 月 / 旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1475"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1645"/>
         <source>Duration 
  Total</source>
         <translation>區間 
 全部</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1477"/>
+        <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>
 Average</source>
         <translation>
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1478"/>
+        <location filename="../qt-ui/models.cpp" line="1651"/>
         <source>
 Shortest</source>
         <translation>
 最短</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1654"/>
         <source>
 Longest</source>
         <translation>
 最長</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1480"/>
+        <location filename="../qt-ui/models.cpp" line="1657"/>
         <source>Depth (%1)
  Average</source>
         <translation>深度 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1481"/>
-        <location filename="../qt-ui/models.cpp" line="1484"/>
-        <location filename="../qt-ui/models.cpp" line="1487"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
+        <location filename="../qt-ui/models.cpp" line="1678"/>
         <source>
 Minimum</source>
         <translation>
 最小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1485"/>
-        <location filename="../qt-ui/models.cpp" line="1488"/>
+        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1672"/>
+        <location filename="../qt-ui/models.cpp" line="1681"/>
         <source>
 Maximum</source>
         <translation>
 最大</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1666"/>
         <source>SAC (%1)
  Average</source>
         <translation>耗氣率 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1675"/>
         <source>Temp. (%1)
  Average</source>
         <translation>溫度 (%1)
@@ -2443,25 +2692,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="62"/>
-        <location filename="../qt-gui.cpp" line="350"/>
+        <location filename="../qt-gui.cpp" line="348"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="66"/>
-        <location filename="../qt-gui.cpp" line="353"/>
+        <location filename="../qt-gui.cpp" line="351"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="103"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../qt-gui.cpp" line="327"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="108"/>
-        <location filename="../qt-gui.cpp" line="334"/>
+        <location filename="../qt-gui.cpp" line="332"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -2494,17 +2743,17 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1055"/>
+        <location filename="../dive.c" line="1104"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) 或 (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="491"/>
-        <location filename="../planner.c" line="97"/>
-        <location filename="../planner.c" line="776"/>
-        <location filename="../planner.c" line="777"/>
-        <location filename="../statistics.c" line="356"/>
-        <location filename="../statistics.c" line="367"/>
+        <location filename="../divelist.c" line="492"/>
+        <location filename="../planner.c" line="95"/>
+        <location filename="../planner.c" line="779"/>
+        <location filename="../planner.c" line="782"/>
+        <location filename="../statistics.c" line="358"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -2536,20 +2785,16 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="107"/>
         <location filename="../file.c" line="109"/>
-        <location filename="../file.c" line="315"/>
-        <location filename="../file.c" line="317"/>
+        <location filename="../file.c" line="378"/>
+        <location filename="../file.c" line="380"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>無法讀取 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="269"/>
-        <location filename="../file.c" line="271"/>
-        <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation>讀取 &apos;%s&apos; 失敗, 使用匯入 CSV 檔案.</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="355"/>
-        <location filename="../file.c" line="357"/>
+        <location filename="../file.c" line="419"/>
+        <location filename="../file.c" line="421"/>
+        <location filename="../file.c" line="498"/>
+        <location filename="../file.c" line="500"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>CSV 匯入最大支援 %d 欄位.</translation>
     </message>
@@ -2691,17 +2936,17 @@ Maximum</source>
         <translation>錯誤的事件編號</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="403"/>
         <source>Unable to create parser for %s %s</source>
         <translation>無法建立解析 %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="407"/>
+        <location filename="../libdivecomputer.c" line="409"/>
         <source>Error registering the data</source>
         <translation>錯誤的登錄資料</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="416"/>
+        <location filename="../libdivecomputer.c" line="417"/>
         <source>Error parsing the datetime</source>
         <translation>日期時間解析錯誤</translation>
     </message>
@@ -2716,133 +2961,158 @@ Maximum</source>
         <translation>潛水時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="448"/>
+        <location filename="../libdivecomputer.c" line="447"/>
         <source>Error parsing the maxdepth</source>
         <translation>最大深度解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="456"/>
         <source>Error parsing the gas mix count</source>
         <translation>混合氣體數量解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="471"/>
+        <location filename="../libdivecomputer.c" line="468"/>
         <source>Error obtaining water salinity</source>
         <translation>得到錯誤的海水鹽度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="476"/>
         <source>Error obtaining surface pressure</source>
         <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="489"/>
+        <location filename="../libdivecomputer.c" line="484"/>
         <source>Error parsing the gas mix</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="497"/>
+        <location filename="../libdivecomputer.c" line="491"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="619"/>
+        <location filename="../libdivecomputer.c" line="621"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="629"/>
         <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="687"/>
+        <location filename="../libdivecomputer.c" line="689"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="712"/>
+        <location filename="../libdivecomputer.c" line="715"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="750"/>
+        <location filename="../libdivecomputer.c" line="754"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="757"/>
+        <location filename="../libdivecomputer.c" line="761"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="479"/>
+        <location filename="../parse-xml.c" line="484"/>
         <source>Strange percentage reading %s
 </source>
         <translation>有問題的讀取比例 %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1616"/>
+        <location filename="../parse-xml.c" line="1625"/>
         <source>Failed to parse '%s'.
 </source>
         <translation>無法解析訊息 &apos;%s&apos; .
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1626"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>無法解析訊息 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1815"/>
+        <location filename="../parse-xml.c" line="1845"/>
         <source>Database query get_events failed.
 </source>
         <translation>資料庫讀取 get_events 失敗.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1850"/>
+        <location filename="../parse-xml.c" line="1852"/>
+        <source>Database query get_tags failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="176"/>
         <source>Database connection failed '%s'.
 </source>
         <translation>資料庫連結錯誤 &apos;%s&apos; .
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1857"/>
+        <location filename="../parse-xml.c" line="1886"/>
+        <location filename="../parse-xml.c" line="2033"/>
         <source>Database query failed '%s'.
 </source>
         <translation>資料庫要求錯誤 &apos;%s&apos; .
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1917"/>
-        <source>Can&apos;t open stylesheet %s</source>
+        <location filename="../parse-xml.c" line="1997"/>
+        <source>Database query get_cylinders failed.
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="99"/>
-        <location filename="../statistics.c" line="360"/>
+        <location filename="../parse-xml.c" line="2004"/>
+        <source>Database query get_changes failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2011"/>
+        <source>Database query get_profile_sample failed.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../parse-xml.c" line="2102"/>
+        <source>Can&apos;t open stylesheet %s</source>
+        <translation>無法開啟樣式 %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="97"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="134"/>
+        <location filename="../planner.c" line="132"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation>無法找到氣源 %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="321"/>
+        <location filename="../planner.c" line="324"/>
         <source>Too many gas mixes</source>
         <translation>太多氣體混合</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="501"/>
+        <location filename="../planner.c" line="504"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2855,274 +3125,262 @@ Subsurface 潛水計畫
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="545"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="554"/>
         <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>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="565"/>
         <source>Switch gas to %s
 </source>
         <translation>更換氣體至 %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="570"/>
+        <location filename="../planner.c" line="573"/>
         <source>Gas consumption:
 </source>
         <translation>氣體消耗:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="581"/>
+        <location filename="../planner.c" line="584"/>
         <source>%.0f%s of %s
 </source>
         <translation>%.0f%s of %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="778"/>
+        <location filename="../planner.c" line="783"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
-        <source>%s
-P:%d %s</source>
-        <translation>%s
-P:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1215"/>
-        <source>%s
-T:%.1f %s</source>
-        <translation>%s
-T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1222"/>
-        <source>%s
-V:%.2f %s</source>
-        <translation>%s
-V:%.2f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1308"/>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation>%s
-計算的深度 %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1315"/>
-        <source>%s
-Tissue %.0fmin: %.0f %s</source>
-        <translation>%s
-組織 %.0fmin: %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1262"/>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation>%s
-安全停留:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1206"/>
-        <source>@:%d:%02d
-D:%.1f %s</source>
-        <translation>@:%d:%02d
-D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1226"/>
-        <source>%s
-SAC:%2.1fl/min</source>
-        <translation>%s
-耗氣率:%2.1fl/min</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1265"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation>%s
-安全停留:未知時間 @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1270"/>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation>%s
-Deco:%umin @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1273"/>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation>%s
-Deco:時間未知 @ %.0f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1279"/>
-        <source>%s
-In deco</source>
-        <translation>%s
-減壓中</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1282"/>
-        <source>%s
-NDL:%umin</source>
-        <translation>%s
-NDL:%umin</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1230"/>
-        <source>%s
-CNS:%u%%</source>
-        <translation>%s
-CNS:%u%%</translation>
+        <location filename="../profile.c" line="1231"/>
+        <source>@: %d:%02d
+D: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1234"/>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation>%s
-pO%s:%.2fbar</translation>
+        <source>P: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1238"/>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation>%s
-pN%s:%.2fbar</translation>
+        <source>T: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation>%s
-pHe:%.2fbar</translation>
+        <location filename="../profile.c" line="1244"/>
+        <source>V: %.1f%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
-        <source>%s
-MOD:%d%s</source>
-        <translation>%s
-MOD:%d%s</translation>
+        <source>SAC: %2.1fl/min
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1254"/>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+        <location filename="../profile.c" line="1249"/>
+        <source>CNS: %u%%
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
-        <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
-        <translation>%s
-Deco:%umin @ %.0f %s (計算)</translation>
+        <location filename="../profile.c" line="1251"/>
+        <source>pO%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
-        <source>%s
-In deco (calc)</source>
-        <translation>%s
-In deco (計算)</translation>
+        <location filename="../profile.c" line="1253"/>
+        <source>pN%s: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1299"/>
-        <source>%s
-NDL:%umin (calc)</source>
-        <translation>%s
-NDL:%umin (預計)</translation>
+        <location filename="../profile.c" line="1255"/>
+        <source>pHe: %.2fbar
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
-        <source>%s
-TTS:%umin (calc)</source>
-        <translation>%s
-TTS:%umin (預計)</translation>
+        <location filename="../profile.c" line="1258"/>
+        <source>MOD: %d%s
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1412"/>
+        <location filename="../profile.c" line="1264"/>
+        <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1271"/>
+        <source>Safetystop: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1274"/>
+        <source>Safetystop: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1279"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1282"/>
+        <source>Deco: unkn time @ %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1286"/>
+        <source>In deco
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1288"/>
+        <source>NDL: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>Deco: %umin @ %.0f%s (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1300"/>
+        <source>In deco (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1302"/>
+        <source>NDL: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1305"/>
+        <source>TTS: %umin (calc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1308"/>
+        <source>Calculated ceiling %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1314"/>
+        <source>Tissue %.0fmin: %.0f%s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1320"/>
+        <source>heartbeat: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1322"/>
+        <source>bearing: %d
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1414"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1416"/>
-        <location filename="../profile.c" line="1420"/>
-        <location filename="../profile.c" line="1424"/>
+        <location filename="../profile.c" line="1418"/>
+        <location filename="../profile.c" line="1422"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1428"/>
+        <location filename="../profile.c" line="1430"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1432"/>
+        <location filename="../profile.c" line="1434"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1436"/>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1438"/>
+        <location filename="../profile.c" line="1442"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1449"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="309"/>
+        <location filename="../qt-gui.cpp" line="308"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../qt-gui.cpp" line="311"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="495"/>
+        <location filename="../qt-gui.cpp" line="498"/>
         <source>%1, %2 %3, %4 %5:%6</source>
         <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="508"/>
+        <location filename="../qt-gui.cpp" line="511"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="521"/>
+        <location filename="../qt-gui.cpp" line="524"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 潛水)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="526"/>
+        <location filename="../qt-gui.cpp" line="529"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 潛水)</translation>
     </message>
@@ -3222,142 +3480,142 @@ TTS:%umin (預計)</translation>
         <translation>減壓</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../statistics.c" line="216"/>
         <source>more than %d days</source>
         <translation>超過 %d日</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="233"/>
+        <location filename="../statistics.c" line="235"/>
         <source>for dives #</source>
         <translation>針對潛水 #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="242"/>
         <source>for selected dives</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for dive #%d</source>
         <translation>針對潛水 #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for selected dive</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for all dives</source>
         <translation>針對所有潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="283"/>
         <source>(no dives)</source>
         <translation>(無潛水)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sun</source>
         <translation>周日</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Mon</source>
         <translation>周一</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Tue</source>
         <translation>周二</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Wed</source>
         <translation>周三</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Thu</source>
         <translation>周四</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Fri</source>
         <translation>周五</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="61"/>
+        <location filename="../subsurfacestartup.c" line="63"/>
         <source>Sat</source>
         <translation>周六</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jan</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Feb</source>
         <translation>2月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Mar</source>
         <translation>3月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Apr</source>
         <translation>4月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>May</source>
         <translation>5月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="70"/>
+        <location filename="../subsurfacestartup.c" line="72"/>
         <source>Jun</source>
         <translation>6月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Jul</source>
         <translation>7月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Aug</source>
         <translation>8月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Sep</source>
         <translation>9月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Oct</source>
         <translation>10月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Nov</source>
         <translation>11月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="71"/>
+        <location filename="../subsurfacestartup.c" line="73"/>
         <source>Dec</source>
         <translation>12月</translation>
     </message>
@@ -3387,187 +3645,187 @@ Is the Uemis Zurich plugged in correctly?</source>
 請確認 Uemis Zurich 是否正確連接?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="106"/>
+        <location filename="../uemis-downloader.c" line="107"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="372"/>
+        <location filename="../uemis-downloader.c" line="379"/>
         <source>Reading %s %s</source>
         <translation>讀取 %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="392"/>
+        <location filename="../uemis-downloader.c" line="399"/>
         <source>data</source>
         <translation>資料</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="413"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>divelog entry id</source>
         <translation>潛水記錄連結 id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="415"/>
+        <location filename="../uemis-downloader.c" line="422"/>
         <source>divespot data id</source>
         <translation>潛點資料 id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="417"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>more data dive id</source>
         <translation>更多潛水記錄, 潛水編號 </translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>wetsuit</source>
         <translation>濕式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>semidry</source>
         <translation>半乾衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="597"/>
+        <location filename="../uemis-downloader.c" line="618"/>
         <source>drysuit</source>
         <translation>乾式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>shorty</source>
         <translation>短袖防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>vest</source>
         <translation>背心</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>long john</source>
         <translation>長約翰式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>jacket</source>
         <translation>夾克式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>full suit</source>
         <translation>全身式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="598"/>
+        <location filename="../uemis-downloader.c" line="619"/>
         <source>2 pcs full suit</source>
         <translation>2 件式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="599"/>
+        <location filename="../uemis-downloader.c" line="620"/>
         <source>membrane</source>
         <translation>膜組織</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="781"/>
+        <location filename="../uemis-downloader.c" line="802"/>
         <source>Init Communication</source>
         <translation>初始化通訊</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="783"/>
+        <location filename="../uemis-downloader.c" line="804"/>
         <source>Uemis init failed</source>
         <translation>Uemis 初始化失敗</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="794"/>
+        <location filename="../uemis-downloader.c" line="815"/>
         <source>Start download</source>
         <translation>開始下載</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="194"/>
+        <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
         <translation>違反安全停留</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
         <translation>速度過快警示</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="199"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
         <translation>速度過快提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="203"/>
         <source>PO2 Green Warning</source>
         <translation>PO2 提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="204"/>
+        <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Warning</source>
         <translation>PO2 上升提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="208"/>
         <source>PO2 Ascend Alarm</source>
         <translation>PO2 上升警告</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
         <translation>氣瓶壓力資訊</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
         <translation>RGT 提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
         <translation>RGT 警告</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
         <translation>氣瓶更換建議</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
         <translation>超過深度限制</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
         <translation>最大減壓時間提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
         <translation>潛水時間資訊</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
         <translation>潛水時間警告</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
         <translation>標記</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
         <translation>無氣瓶資料</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
         <translation>電池低電量提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
         <translation>電池低電量警示</translation>
     </message>